diff --git a/build/windows/launcher/.cvsignore b/build/windows/launcher/.cvsignore index 6d1f10c93..9f4af1117 100644 --- a/build/windows/launcher/.cvsignore +++ b/build/windows/launcher/.cvsignore @@ -5,4 +5,5 @@ launcher.opt launcher.plg launcher.exe launcher.ilk +launcher.aps diff --git a/build/windows/launcher/StdAfx.cpp b/build/windows/launcher/StdAfx.cpp index 657292ee0..d90e105d4 100644 --- a/build/windows/launcher/StdAfx.cpp +++ b/build/windows/launcher/StdAfx.cpp @@ -1,5 +1,5 @@ // stdafx.cpp : source file that includes just the standard includes -// Imager.pch will be the pre-compiled header +// Launcher.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information #include "stdafx.h" diff --git a/build/windows/launcher/document.ico b/build/windows/launcher/document.ico index fb4a1db20..6e1ec7498 100644 Binary files a/build/windows/launcher/document.ico and b/build/windows/launcher/document.ico differ diff --git a/build/windows/launcher/launcher.cpp b/build/windows/launcher/launcher.cpp index ff1b4b47a..055cb6fbd 100644 --- a/build/windows/launcher/launcher.cpp +++ b/build/windows/launcher/launcher.cpp @@ -1,4 +1,4 @@ -// Imager.cpp : Defines the class behaviors for the application. +// Launcher.cpp : Defines the class behaviors for the application. // #include "stdafx.h" @@ -21,10 +21,10 @@ static char THIS_FILE[] = __FILE__; #endif ///////////////////////////////////////////////////////////////////////////// -// CImagerApp +// CLauncherApp -BEGIN_MESSAGE_MAP(CImagerApp, CWinApp) - //{{AFX_MSG_MAP(CImagerApp) +BEGIN_MESSAGE_MAP(CLauncherApp, CWinApp) + //{{AFX_MSG_MAP(CLauncherApp) // NOTE - the ClassWizard will add and remove mapping macros here. // DO NOT EDIT what you see in these blocks of generated code! //}}AFX_MSG @@ -32,23 +32,23 @@ BEGIN_MESSAGE_MAP(CImagerApp, CWinApp) END_MESSAGE_MAP() ///////////////////////////////////////////////////////////////////////////// -// CImagerApp construction +// CLauncherApp construction -CImagerApp::CImagerApp() +CLauncherApp::CLauncherApp() { // TODO: add construction code here, // Place all significant initialization in InitInstance } ///////////////////////////////////////////////////////////////////////////// -// The one and only CImagerApp object +// The one and only CLauncherApp object -CImagerApp theApp; +CLauncherApp theApp; ///////////////////////////////////////////////////////////////////////////// -// CImagerApp initialization +// CLauncherApp initialization -BOOL CImagerApp::InitInstance() +BOOL CLauncherApp::InitInstance() { // all these malloc statements... things may need to be larger. @@ -88,7 +88,7 @@ BOOL CImagerApp::InitInstance() */ strcpy(outgoing_cmdline, JAVA_ARGS); - // append the classpath and imager.Application + // append the classpath and launcher.Application char *cp = (char *)malloc(1024 * sizeof(char)); char *loaddir = (char *)malloc(MAX_PATH * sizeof(char)); @@ -111,7 +111,7 @@ BOOL CImagerApp::InitInstance() strcat(outgoing_cmdline, cp); // add the name of the class to execute - //strcat(outgoing_cmdline, "imager.Application "); + //strcat(outgoing_cmdline, "launcher.Application "); strcat(outgoing_cmdline, JAVA_MAIN_CLASS); strcat(outgoing_cmdline, " "); // space between next arg @@ -123,7 +123,7 @@ BOOL CImagerApp::InitInstance() char *executable = (char *)malloc(256 * sizeof(char)); // loaddir is the name path to the current application strcpy(executable, loaddir); - // copy in the path for jrew, relative to imager.exe + // copy in the path for jrew, relative to launcher.exe //strcat(executable, "\\bin\\jrew"); strcat(executable, "\\java\\bin\\javaw"); diff --git a/build/windows/launcher/launcher.dsp b/build/windows/launcher/launcher.dsp index d2ee14e98..a4dd17947 100644 --- a/build/windows/launcher/launcher.dsp +++ b/build/windows/launcher/launcher.dsp @@ -8,12 +8,12 @@ CFG=Launcher - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE -!MESSAGE NMAKE /f "Launcher.mak". +!MESSAGE NMAKE /f "launcher.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "Launcher.mak" CFG="Launcher - Win32 Debug" +!MESSAGE NMAKE /f "launcher.mak" CFG="Launcher - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -129,6 +129,10 @@ SOURCE=.\document.ico # End Source File # Begin Source File +SOURCE=.\launcher.rc +# End Source File +# Begin Source File + SOURCE=.\resources.rc2 # End Source File # End Group diff --git a/build/windows/launcher/launcher.exe b/build/windows/launcher/launcher.exe new file mode 100755 index 000000000..b7efc7a01 Binary files /dev/null and b/build/windows/launcher/launcher.exe differ diff --git a/build/windows/launcher/launcher.h b/build/windows/launcher/launcher.h index 1daf56029..69800c88e 100644 --- a/build/windows/launcher/launcher.h +++ b/build/windows/launcher/launcher.h @@ -1,8 +1,8 @@ // launcher.h : main header file for the LAUNCHER application // -#if !defined(AFX_IMAGER_H__12C4E5A4_27C5_11D2_BB54_006008DC2F94__INCLUDED_) -#define AFX_IMAGER_H__12C4E5A4_27C5_11D2_BB54_006008DC2F94__INCLUDED_ +#if !defined(AFX_LAUNCHER_H__12C4E5A4_27C5_11D2_BB54_006008DC2F94__INCLUDED_) +#define AFX_LAUNCHER_H__12C4E5A4_27C5_11D2_BB54_006008DC2F94__INCLUDED_ #if _MSC_VER >= 1000 #pragma once @@ -19,27 +19,27 @@ extern "C" { } ///////////////////////////////////////////////////////////////////////////// -// CImagerApp: -// See Imager.cpp for the implementation of this class +// CLauncherApp: +// See Launcher.cpp for the implementation of this class // -class CImagerApp : public CWinApp +class CLauncherApp : public CWinApp { public: - CImagerApp(); + CLauncherApp(); // Overrides // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CImagerApp) + //{{AFX_VIRTUAL(CLauncherApp) public: virtual BOOL InitInstance(); //}}AFX_VIRTUAL - void CImagerApp::buildClassPath(char*); + void CLauncherApp::buildClassPath(char*); // Implementation - //{{AFX_MSG(CImagerApp) + //{{AFX_MSG(CLauncherApp) // NOTE - the ClassWizard will add and remove member functions here. // DO NOT EDIT what you see in these blocks of generated code ! //}}AFX_MSG @@ -52,4 +52,4 @@ public: //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. -#endif // !defined(AFX_IMAGER_H__12C4E5A4_27C5_11D2_BB54_006008DC2F94__INCLUDED_) +#endif // !defined(AFX_LAUNCHER_H__12C4E5A4_27C5_11D2_BB54_006008DC2F94__INCLUDED_) diff --git a/build/windows/launcher/launcher.rc b/build/windows/launcher/launcher.rc index 6a95c96fa..9647a4804 100644 --- a/build/windows/launcher/launcher.rc +++ b/build/windows/launcher/launcher.rc @@ -50,7 +50,7 @@ BEGIN "LANGUAGE 9, 1\r\n" "#pragma code_page(1252)\r\n" "#endif\r\n" - "#include ""res\\other.rc2"" // non-Microsoft Visual C++ edited resources\r\n" + "#include ""resources.rc2"" // non-Microsoft Visual C++ edited resources\r\n" "#include ""afxres.rc"" // Standard components\r\n" "#endif\0" END @@ -65,8 +65,8 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDR_MAINFRAME ICON DISCARDABLE "res\\application.ico" -IDR_DOCUMENT ICON DISCARDABLE "res\\document.ico" +IDR_MAINFRAME ICON DISCARDABLE "application.ico" +IDR_DOCUMENT ICON DISCARDABLE "document.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -167,7 +167,7 @@ END LANGUAGE 9, 1 #pragma code_page(1252) #endif -#include "res\other.rc2" // non-Microsoft Visual C++ edited resources +#include "resources.rc2" // non-Microsoft Visual C++ edited resources #include "afxres.rc" // Standard components #endif ///////////////////////////////////////////////////////////////////////////// diff --git a/build/windows/launcher/resource.h b/build/windows/launcher/resource.h index 0ca4c9ba2..340d1b525 100644 --- a/build/windows/launcher/resource.h +++ b/build/windows/launcher/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. -// Used by Imager.rc +// Used by launcher.rc // #define IDD_IMAGER_DIALOG 102 #define IDR_MAINFRAME 128