Author: reinhard Date: 2009-11-26 15:40:25 -0600 (Thu, 26 Nov 2009) New Revision: 10066
Modified: trunk/gnue-common/packaging/win32/gnue-common.iss.dist_template trunk/gnue-common/packaging/win32/gnue-runtime.iss trunk/gnue-common/packaging/win32/mk-runtime.cmd trunk/gnue-common/packaging/win32/setup.cmd trunk/gnue-common/packaging/win32/setup.py trunk/gnue-common/setup.py trunk/gnue-forms/packaging/win32/gnue-forms.iss.dist_template trunk/gnue-forms/packaging/win32/setup.cmd trunk/gnue-reports/packaging/win32/gnue-reports.iss.dist_template trunk/gnue-reports/packaging/win32/setup.cmd trunk/gnue-reports/packaging/win32/setup.py Log: Some work on Windows installation. Modified: trunk/gnue-common/packaging/win32/gnue-common.iss.dist_template =================================================================== --- trunk/gnue-common/packaging/win32/gnue-common.iss.dist_template 2009-11-26 21:12:48 UTC (rev 10065) +++ trunk/gnue-common/packaging/win32/gnue-common.iss.dist_template 2009-11-26 21:40:25 UTC (rev 10066) @@ -16,7 +16,7 @@ ChangesAssociations=true CreateAppDir=true ShowLanguageDialog=yes -OutputDir=C:\GNUE\dist +OutputDir=C:\GNUe\dist OutputBaseFilename=:PACKAGE:-:VERSION: DisableDirPage=true @@ -28,21 +28,19 @@ Name: translations; Description: Translations; Types: full [Files] -Source: c:\gnue\bin\gnue-schema.exe; DestDir: {app}\bin; Components: main; Flags: ignoreversion -Source: c:\gnue\bin\gnue\*.*; DestDir: {app}\bin\gnue; Components: main; Flags: ignoreversion -Source: c:\gnue\bin\gnue\common\*.*; DestDir: {app}\bin\gnue\common; Flags: recursesubdirs ignoreversion; Components: main -Source: C:\gnue\etc\gnue.conf; DestDir: {app}\etc; Components: main; Flags: onlyifdoesntexist -Source: C:\gnue\etc\connections.conf; DestDir: {app}\etc; Components: main; Flags: onlyifdoesntexist -Source: c:\gnue\share\locale\gnue-common.mo; DestDir: {app}\share\locale\; Flags: recursesubdirs createallsubdirs; Components: translations -Source: c:\gnue\share\doc\gnue-common\*.*; DestDir: {app}\share\doc\gnue-common; Flags: recursesubdirs; Components: doc -Source: c:\gnue\share\gnue\*.*; DestDir: {app}\share\gnue\; Components: main; Flags: recursesubdirs createallsubdirs +Source: C:\GNUe\Bin\gnue-schema.exe; DestDir: {app}\Bin; Components: main; Flags: ignoreversion +Source: C:\GNUe\Bin\gnue\*.*; DestDir: {app}\Bin\gnue; Components: main; Flags: ignoreversion +Source: C:\GNUe\Bin\gnue\common\*.*; DestDir: {app}\Bin\gnue\common; Flags: recursesubdirs ignoreversion; Components: main +Source: C:\GNUe\Config\gnue.conf; DestDir: {app}\Config; Components: main; Flags: onlyifdoesntexist +Source: C:\GNUe\Config\backends.conf; DestDir: {app}\Config; Components: main; Flags: onlyifdoesntexist +Source: C:\GNUe\share\locale\gnue-common.mo; DestDir: {app}\share\locale\; Flags: recursesubdirs createallsubdirs; Components: translations +Source: C:\GNUe\share\doc\gnue-common\*.*; DestDir: {app}\share\doc\gnue-common; Flags: recursesubdirs; Components: doc +Source: C:\GNUe\share\gnue\*.*; DestDir: {app}\share\gnue\; Components: main; Flags: recursesubdirs createallsubdirs -[Icons] - [UninstallDelete] -Type: filesandordirs; Name: {app}\bin\gnue\common\*.* -Type: files; Name: {app}\bin\gnue-schema.exe -Type: files; Name: {app}\bin\gnue\*.* +Type: filesandordirs; Name: {app}\Bin\gnue\common\*.* +Type: files; Name: {app}\Bin\gnue-schema.exe +Type: files; Name: {app}\Bin\gnue\*.* [Code] function GetPathInstalled(AppID: String): String; @@ -79,5 +77,5 @@ [Registry] Root: HKCR; SubKey: .gsd; ValueType: string; ValueData: GNUeSchema; Flags: uninsdeletekey Root: HKCR; SubKey: GNUeSchema; ValueType: string; ValueData: GNUe Schema Definition; Flags: uninsdeletekey -Root: HKCR; SubKey: GNUeSchema\Shell\Open\Command; ValueType: string; ValueData: """{app}\bin\gnue-schema.exe"" ""%1"""; Flags: uninsdeletevalue -Root: HKCR; Subkey: GNUeSchema\DefaultIcon; ValueType: string; ValueData: {app}\bin\gnue-schema.exe,-1; Flags: uninsdeletevalue +Root: HKCR; SubKey: GNUeSchema\Shell\Open\Command; ValueType: string; ValueData: """{app}\Bin\gnue-schema.exe"" ""%1"""; Flags: uninsdeletevalue +Root: HKCR; Subkey: GNUeSchema\DefaultIcon; ValueType: string; ValueData: {app}\Bin\gnue-schema.exe,-1; Flags: uninsdeletevalue Modified: trunk/gnue-common/packaging/win32/gnue-runtime.iss =================================================================== --- trunk/gnue-common/packaging/win32/gnue-runtime.iss 2009-11-26 21:12:48 UTC (rev 10065) +++ trunk/gnue-common/packaging/win32/gnue-runtime.iss 2009-11-26 21:40:25 UTC (rev 10066) @@ -12,10 +12,10 @@ DefaultDirName={pf}\GNUe\ DefaultGroupName=GNUe AllowNoIcons=true -OutputDir=C:\GNUE\dist +OutputDir=C:\GNUe\dist OutputBaseFilename=gnue-runtime-environment-2009.10.31.win32-py2.5 [Files] -Source: c:\gnue\bin\*.dll; DestDir: {app}\bin; Flags: ignoreversion -Source: c:\gnue\bin\*.pyd; DestDir: {app}\bin; Flags: ignoreversion -Source: c:\gnue\bin\*.zip; DestDir: {app}\bin; Flags: ignoreversion +Source: C:\GNUe\Bin\*.dll; DestDir: {app}\Bin; Flags: ignoreversion +Source: C:\GNUe\Bin\*.pyd; DestDir: {app}\Bin; Flags: ignoreversion +Source: C:\GNUe\Bin\*.zip; DestDir: {app}\Bin; Flags: ignoreversion Modified: trunk/gnue-common/packaging/win32/mk-runtime.cmd =================================================================== --- trunk/gnue-common/packaging/win32/mk-runtime.cmd 2009-11-26 21:12:48 UTC (rev 10065) +++ trunk/gnue-common/packaging/win32/mk-runtime.cmd 2009-11-26 21:40:25 UTC (rev 10066) @@ -2,14 +2,14 @@ REM --------------------------------------------------------------------------- REM Create an Installer Package REM -REM $Id: setup.cmd 9736 2007-06-25 14:56:51Z johannes $ +REM $Id$ REM --------------------------------------------------------------------------- REM --------------------------------------------------------------------------- REM Prepare the build environment REM --------------------------------------------------------------------------- -SET GNUE_PATH="C:\GNUE" +SET GNUE_PATH="C:\GNUe" IF EXIST %GNUE_PATH% ( RMDIR /S /Q %GNUE_PATH% @@ -19,7 +19,7 @@ REM Create executable REM --------------------------------------------------------------------------- -C:\PYTHON25\PYTHON setup-runtime.py py2exe -c -d %GNUE_PATH%\BIN +C:\PYTHON25\PYTHON setup-runtime.py py2exe -c -d %GNUE_PATH%\Bin REM --------------------------------------------------------------------------- REM Clean up build environment Property changes on: trunk/gnue-common/packaging/win32/mk-runtime.cmd ___________________________________________________________________ Name: svn:keywords + Id Modified: trunk/gnue-common/packaging/win32/setup.cmd =================================================================== --- trunk/gnue-common/packaging/win32/setup.cmd 2009-11-26 21:12:48 UTC (rev 10065) +++ trunk/gnue-common/packaging/win32/setup.cmd 2009-11-26 21:40:25 UTC (rev 10066) @@ -10,7 +10,7 @@ REM --------------------------------------------------------------------------- @ECHO Setting up the build environment ... -SET GNUE_PATH="C:\GNUE" +SET GNUE_PATH="C:\GNUe" IF EXIST %GNUE_PATH% ( RMDIR /S /Q %GNUE_PATH% @@ -30,7 +30,7 @@ REM NOTE: we do *not* compile the py files here, because this would add a wrong REM path to the pyc-files, which in turn breaks translation later -python setup.py install --prefix=%GNUE_PATH% --install-lib=%GNUE_PATH%\bin --no-compile +C:\PYTHON25\PYTHON setup.py install --prefix=%GNUE_PATH% --install-lib=%GNUE_PATH%\bin --no-compile REM --------------------------------------------------------------------------- @@ -42,7 +42,7 @@ @ECHO Building EXE-File ... PUSHD %GNUE_PATH%\Scripts -python setup.py py2exe -c -d %GNUE_PATH%\bin +C:\PYTHON25\PYTHON setup.py py2exe -c -d %GNUE_PATH%\Bin POPD Modified: trunk/gnue-common/packaging/win32/setup.py =================================================================== --- trunk/gnue-common/packaging/win32/setup.py 2009-11-26 21:12:48 UTC (rev 10065) +++ trunk/gnue-common/packaging/win32/setup.py 2009-11-26 21:40:25 UTC (rev 10066) @@ -34,9 +34,9 @@ # ----------------------------------------------------------------------------- # The path where we are creating the build environment for the setup compiler -GNUE_PATH='C:\\GNUE' +GNUE_PATH='C:\\GNUe' # The config files to rewrite (wrt line-ending) -CFG_FILES = ['gnue.conf', 'connections.conf'] +CFG_FILES = ['gnue.conf', 'backends.conf'] # The InnoSetup configuration file ISS_FILE = 'gnue-common.iss' @@ -50,7 +50,7 @@ gnue-common. """ - setup( \ + setup( console = ['gnue-schema'], options = {"py2exe": {"dll_excludes": ["msvcp60.dll", @@ -73,13 +73,13 @@ """ for name in CFG_FILES: - fhd = open(os.path.join(GNUE_PATH, 'etc', 'sample.%s' % name)) + fhd = open(os.path.join(GNUE_PATH, 'Config', name)) data = [line.strip() for line in fhd.readlines()] - out = open(os.path.join(GNUE_PATH, 'etc', name), 'wb') + fhd.close() + out = open(os.path.join(GNUE_PATH, 'Config', name), 'wb') for line in data: out.write('%s%s' % (line, os.linesep)) out.close() - fhd.close() # ----------------------------------------------------------------------------- Modified: trunk/gnue-common/setup.py =================================================================== --- trunk/gnue-common/setup.py 2009-11-26 21:12:48 UTC (rev 10065) +++ trunk/gnue-common/setup.py 2009-11-26 21:40:25 UTC (rev 10066) @@ -408,7 +408,7 @@ "'win32':\n") output.write(" data = os.path.dirname(os.path.dirname(" \ "sys.argv[0]))\n") - output.write(" config = os.path.join(data, 'etc')\n") + output.write(" config = os.path.join(data, 'Config')\n") output.write("else:\n") output.write(" data = \"%s\"\n" % \ self.__quote(self.install_data)) Modified: trunk/gnue-forms/packaging/win32/gnue-forms.iss.dist_template =================================================================== --- trunk/gnue-forms/packaging/win32/gnue-forms.iss.dist_template 2009-11-26 21:12:48 UTC (rev 10065) +++ trunk/gnue-forms/packaging/win32/gnue-forms.iss.dist_template 2009-11-26 21:40:25 UTC (rev 10066) @@ -16,37 +16,33 @@ ChangesAssociations=true CreateAppDir=true ShowLanguageDialog=yes -OutputDir=C:\GNUE\dist +OutputDir=C:\GNUe\dist OutputBaseFilename=:PACKAGE:-:VERSION: DisableDirPage=true AppendDefaultDirName=false -[Tasks] - [Components] Name: main; Description: Shared Program Files; Types: full compact custom; Flags: fixed Name: doc; Description: Documentation; Types: full Name: translations; Description: Translations; Types: full [Files] -Source: c:\gnue\bin\gnue-forms.exe; DestDir: {app}\bin; Components: main; Flags: ignoreversion -Source: c:\gnue\bin\gnue\forms\*.*; DestDir: {app}\bin\gnue\forms; Flags: recursesubdirs ignoreversion; Components: main -Source: c:\gnue\share\locale\gnue-forms.mo; DestDir: {app}\share\locale\; Flags: recursesubdirs createallsubdirs; Components: translations -Source: c:\gnue\share\doc\gnue-forms\*.*; DestDir: {app}\share\doc\gnue-forms; Flags: recursesubdirs; Components: doc -Source: c:\gnue\share\gnue\*.*; DestDir: {app}\share\gnue\; Components: main; Flags: recursesubdirs createallsubdirs +Source: C:\GNUe\Bin\gnue-forms.exe; DestDir: {app}\Bin; Components: main; Flags: ignoreversion +Source: C:\GNUe\Bin\gnue\forms\*.*; DestDir: {app}\Bin\gnue\forms; Flags: recursesubdirs ignoreversion; Components: main +Source: C:\GNUe\share\locale\gnue-forms.mo; DestDir: {app}\share\locale\; Flags: recursesubdirs createallsubdirs; Components: translations +Source: C:\GNUe\share\doc\gnue-forms\*.*; DestDir: {app}\share\doc\gnue-forms; Flags: recursesubdirs; Components: doc +Source: C:\GNUe\share\gnue\*.*; DestDir: {app}\share\gnue\; Components: main; Flags: recursesubdirs createallsubdirs -[Icons] - [Registry] ; These four associations associate GFD files with GNUe Forms Root: HKCR; Subkey: .gfd; ValueType: string; ValueName: ; ValueData: GNUeFormsClient; Flags: uninsdeletekey deletekey Root: HKCR; Subkey: GNUeFormsClient; ValueType: string; ValueName: ; ValueData: GNUe Form Definition; Flags: uninsdeletekey deletekey ;when we get a nifty icon, that's set here :) -Root: HKCR; Subkey: GNUeFormsClient\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\bin\GNUE-FORMS.EXE,0 -Root: HKCR; Subkey: GNUeFormsClient\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\bin\GNUE-FORMS.EXE"" ""%1"""; Flags: deletekey +Root: HKCR; Subkey: GNUeFormsClient\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\Bin\gnue-forms.exe,0 +Root: HKCR; Subkey: GNUeFormsClient\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\Bin\gnue-forms.exe"" ""%1"""; Flags: deletekey [UninstallDelete] -Name: {app}\bin\gnue\forms\*.*; Type: filesandordirs +Name: {app}\Bin\gnue\forms\*.*; Type: filesandordirs [Code] function GetPathInstalled(AppID: String): String; Modified: trunk/gnue-forms/packaging/win32/setup.cmd =================================================================== --- trunk/gnue-forms/packaging/win32/setup.cmd 2009-11-26 21:12:48 UTC (rev 10065) +++ trunk/gnue-forms/packaging/win32/setup.cmd 2009-11-26 21:40:25 UTC (rev 10066) @@ -10,7 +10,7 @@ REM --------------------------------------------------------------------------- @ECHO Setting up the build environment ... -SET GNUE_PATH="C:\GNUE" +SET GNUE_PATH="C:\GNUe" IF EXIST %GNUE_PATH% ( RMDIR /S /Q %GNUE_PATH% @@ -32,7 +32,7 @@ REM Note: We do *not* compile the py files here, because this would add a wrong REM path to the pyc-files, which in turn breaks translations later. -python setup.py install --install-scripts=%GNUE_PATH%\Scripts --install-lib=%GNUE_PATH%\bin --install-data=%GNUE_PATH% --install-config=%GNUE_PATH%\etc --no-compile +C:\PYTHON25\PYTHON setup.py install --install-scripts=%GNUE_PATH%\Scripts --install-lib=%GNUE_PATH%\Bin --install-data=%GNUE_PATH% --install-config=%GNUE_PATH%\Config --no-compile REM --------------------------------------------------------------------------- @@ -44,7 +44,7 @@ @ECHO Building EXE-File ... PUSHD %GNUE_PATH%\Scripts -python setup.py py2exe -c -d %GNUE_PATH%\bin +C:\PYTHON25\PYTHON setup.py py2exe -c -d %GNUE_PATH%\Bin POPD Modified: trunk/gnue-reports/packaging/win32/gnue-reports.iss.dist_template =================================================================== --- trunk/gnue-reports/packaging/win32/gnue-reports.iss.dist_template 2009-11-26 21:12:48 UTC (rev 10065) +++ trunk/gnue-reports/packaging/win32/gnue-reports.iss.dist_template 2009-11-26 21:40:25 UTC (rev 10066) @@ -16,34 +16,29 @@ ChangesAssociations=true CreateAppDir=true ShowLanguageDialog=yes -OutputDir=C:\GNUE\dist +OutputDir=C:\GNUe\dist OutputBaseFilename=:PACKAGE:-:VERSION: DisableDirPage=true AppendDefaultDirName=false -[Tasks] - [Components] Name: main; Description: Shared Program Files; Types: full compact custom; Flags: fixed Name: doc; Description: Documentation; Types: full Name: translations; Description: Translations; Types: full [Files] -Source: c:\gnue\bin\gnue-reports.exe; DestDir: {app}\bin; Components: main; Flags: ignoreversion -Source: c:\gnue\bin\gnue-reports-server.exe; DestDir: {app}\bin; Components: main; Flags: ignoreversion -Source: c:\gnue\bin\gnue\reports\*.*; DestDir: {app}\bin\gnue\reports; Flags: recursesubdirs ignoreversion; Components: main -Source: c:\gnue\share\locale\gnue-reports.mo; DestDir: {app}\share\locale\; Flags: recursesubdirs createallsubdirs; Components: translations -Source: c:\gnue\share\doc\gnue-reports\*.*; DestDir: {app}\share\doc\gnue-reports; Flags: recursesubdirs; Components: doc -Source: c:\gnue\share\gnue\*.*; DestDir: {app}\share\gnue\; Components: main; Flags: recursesubdirs createallsubdirs +Source: C:\GNUe\Bin\gnue-reports.exe; DestDir: {app}\Bin; Components: main; Flags: ignoreversion +Source: C:\GNUe\Bin\gnue-reports-server.exe; DestDir: {app}\Bin; Components: main; Flags: ignoreversion +Source: C:\GNUe\Bin\gnue\reports\*.*; DestDir: {app}\Bin\gnue\reports; Flags: recursesubdirs ignoreversion; Components: main +Source: C:\GNUe\share\locale\gnue-reports.mo; DestDir: {app}\share\locale\; Flags: recursesubdirs createallsubdirs; Components: translations +Source: C:\GNUe\share\doc\gnue-reports\*.*; DestDir: {app}\share\doc\gnue-reports; Flags: recursesubdirs; Components: doc +Source: C:\GNUe\share\gnue\*.*; DestDir: {app}\share\gnue\; Components: main; Flags: recursesubdirs createallsubdirs -[Icons] - [Registry] ; Place the associations for GRD files with GNUe Reports here (later) - [UninstallDelete] -Name: {app}\bin\gnue\reports\*.*; Type: filesandordirs +Name: {app}\Bin\gnue\reports\*.*; Type: filesandordirs [Code] function GetPathInstalled(AppID: String): String; Modified: trunk/gnue-reports/packaging/win32/setup.cmd =================================================================== --- trunk/gnue-reports/packaging/win32/setup.cmd 2009-11-26 21:12:48 UTC (rev 10065) +++ trunk/gnue-reports/packaging/win32/setup.cmd 2009-11-26 21:40:25 UTC (rev 10066) @@ -10,14 +10,14 @@ REM --------------------------------------------------------------------------- @ECHO Setting up the build environment ... -SET GNUE_PATH="C:\GNUE" +SET GNUE_PATH="C:\GNUe" IF EXIST %GNUE_PATH% ( RMDIR /S /Q %GNUE_PATH% ) MKDIR %GNUE_PATH% MKDIR %GNUE_PATH%\Scripts -MKDIR %GNUE_PATH%\etc +MKDIR %GNUE_PATH%\Config COPY setup.py %GNUE_PATH%\Scripts COPY gnue-reports.iss %GNUE_PATH%\Scripts @@ -32,7 +32,7 @@ REM Note: We do *not* compile the py files here, because this would add a wrong REM path to the pyc-files, which in turn breaks translations later. -python setup.py install --install-scripts=%GNUE_PATH%\Scripts --install-lib=%GNUE_PATH%\bin --install-data=%GNUE_PATH% --install-config=%GNUE_PATH%\etc --no-compile +C:\PYTHON25\PYTHON setup.py install --install-scripts=%GNUE_PATH%\Scripts --install-lib=%GNUE_PATH%\Bin --install-data=%GNUE_PATH% --install-config=%GNUE_PATH%\Config --no-compile REM --------------------------------------------------------------------------- @@ -44,7 +44,7 @@ @ECHO Building EXE-File ... PUSHD %GNUE_PATH%\Scripts -python setup.py py2exe -c -d %GNUE_PATH%\bin +C:\PYTHON25\PYTHON setup.py py2exe -c -d %GNUE_PATH%\Bin POPD Modified: trunk/gnue-reports/packaging/win32/setup.py =================================================================== --- trunk/gnue-reports/packaging/win32/setup.py 2009-11-26 21:12:48 UTC (rev 10065) +++ trunk/gnue-reports/packaging/win32/setup.py 2009-11-26 21:40:25 UTC (rev 10066) @@ -34,9 +34,7 @@ # ----------------------------------------------------------------------------- # The path where we are creating the build environment for the setup compiler -GNUE_PATH='C:\\GNUE' -# The config files to rewrite (wrt line-ending) -CFG_FILES = [] +GNUE_PATH='C:\\GNUe' # The InnoSetup configuration file ISS_FILE = 'gnue-reports.iss' @@ -71,28 +69,6 @@ # ----------------------------------------------------------------------------- -# Create a list of all modules in the standard library -# ----------------------------------------------------------------------------- - -def getimports(libdir): - """ - Returns a list of all modules in the standard python library. - """ - importlist = [] - for entry in os.listdir(libdir): - if entry.startswith('_') or '-' in entry or \ - entry.count('.')>1 or ' ' in entry: - continue - - if not os.path.splitext(entry)[1] == '.py': - continue - - importlist.append(entry[:entry.find('.')]) - - return importlist - - -# ----------------------------------------------------------------------------- # Run the setup to create all the exe files in the gnue-common package # ----------------------------------------------------------------------------- def create_exe_files(): @@ -117,28 +93,6 @@ # ----------------------------------------------------------------------------- -# Finalize the build environment -# ----------------------------------------------------------------------------- - -def finalize_build_env(): - """ - Finalize the build environment ready to be processed by the setup compiler - """ - - for name in CFG_FILES: - fhd = open(os.path.join(GNUE_PATH, 'share', 'doc', 'gnue-reports', - 'sample.%s' % name)) - data = [line.strip() for line in fhd.readlines()] - dest = os.path.join(GNUE_PATH, 'etc', name) - if not os.path.exists(dest): - out = open(dest, 'wb') - for line in data: - out.write('%s%s' % (line, os.linesep)) - out.close() - fhd.close() - - -# ----------------------------------------------------------------------------- # Examine the registry to find out where the InnoSetup compiler is located # ----------------------------------------------------------------------------- @@ -156,6 +110,7 @@ return path + # ----------------------------------------------------------------------------- # Compile the setup # ----------------------------------------------------------------------------- @@ -177,6 +132,4 @@ create_exe_files() -finalize_build_env() - compile_setup() _______________________________________________ commit-gnue mailing list commit-gnue@gnu.org http://lists.gnu.org/mailman/listinfo/commit-gnue