[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r10127 - in trunk: gnue-common/packaging/win32 gnue-forms/packagi
|
From: |
reinhard |
|
Subject: |
[gnue] r10127 - in trunk: gnue-common/packaging/win32 gnue-forms/packaging/win32 gnue-navigator/packaging/win32 gnue-reports/packaging/win32 |
|
Date: |
Mon, 14 Dec 2009 10:03:20 -0600 (CST) |
Author: reinhard
Date: 2009-12-14 10:03:19 -0600 (Mon, 14 Dec 2009)
New Revision: 10127
Added:
trunk/gnue-common/packaging/win32/compile-iss.py
trunk/gnue-common/packaging/win32/gnue-runtime-environment.iss
trunk/gnue-common/packaging/win32/install-runtime.cmd
trunk/gnue-common/packaging/win32/install.cmd
trunk/gnue-common/packaging/win32/make-package-runtime.cmd
trunk/gnue-common/packaging/win32/make-package.cmd
trunk/gnue-forms/packaging/win32/compile-iss.py
trunk/gnue-forms/packaging/win32/install.cmd
trunk/gnue-forms/packaging/win32/make-package.cmd
trunk/gnue-navigator/packaging/win32/compile-iss.py
trunk/gnue-navigator/packaging/win32/install.cmd
trunk/gnue-navigator/packaging/win32/make-package.cmd
trunk/gnue-reports/packaging/win32/compile-iss.py
trunk/gnue-reports/packaging/win32/install.cmd
trunk/gnue-reports/packaging/win32/make-package.cmd
Removed:
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-forms/packaging/win32/setup.cmd
trunk/gnue-navigator/packaging/win32/setup.cmd
trunk/gnue-reports/packaging/win32/setup.cmd
Modified:
trunk/gnue-common/packaging/win32/README
trunk/gnue-common/packaging/win32/README.runtime
trunk/gnue-common/packaging/win32/gnue-common.iss.dist_template
trunk/gnue-common/packaging/win32/setup-runtime.py
trunk/gnue-common/packaging/win32/setup.py
trunk/gnue-forms/packaging/win32/README.self-contained-installer
trunk/gnue-forms/packaging/win32/gnue-forms.iss.dist_template
trunk/gnue-forms/packaging/win32/setup.py
trunk/gnue-navigator/packaging/win32/gnue-navigator.iss.dist_template
trunk/gnue-navigator/packaging/win32/setup.py
trunk/gnue-reports/packaging/win32/gnue-reports.iss.dist_template
trunk/gnue-reports/packaging/win32/setup.py
Log:
Improvements to Windows packaging.
Modified: trunk/gnue-common/packaging/win32/README
===================================================================
--- trunk/gnue-common/packaging/win32/README 2009-12-12 14:29:05 UTC (rev
10126)
+++ trunk/gnue-common/packaging/win32/README 2009-12-14 16:03:19 UTC (rev
10127)
@@ -11,10 +11,8 @@
* py2exe: http://sourceforge.net/projects/py2exe/
* Inno Setup Compiler: http://www.jrsoftware.org/isdl.php
- (download QuickStart Pack, it contains the needed ISTool)
-
How to build a Setup.exe of GNUe Common for win32:
--------------------------------------------------
@@ -24,20 +22,20 @@
2. Extract this source-package to a folder you like. You can remove this
folder after the build process has finished. Let's assume you've choosen
- the folder D:\TMP and you've downloaded the package gnue-common-0.6.9
+ the folder D:\TMP and you've downloaded the package gnue-common-0.7.0
-3. Change into the direcotry "D:\TMP\gnue-common-0.6.9\packaging\win32"
+3. Change into the direcotry "D:\TMP\gnue-common-0.7.0\packaging\win32"
-4. Execute the script "setup.cmd". You can do this either on a command prompt
- by entering "setup.cmd" or you can do it by double clicking the file in the
- windows explorer.
+4. Execute the script "make-package.cmd". You can do this either on a command
+ prompt by entering "make-package.cmd" or you can do it by double clicking
+ the file in windows explorer.
This script builds and compiles everything needed. After it has finished
- you will find a file called "gnue-common-0.6.9.exe" in the packaging
- directory - which was in our example
- "D:\TMP\gnue-common-0.6.9\packaging\win32". This is your freshly built
- setup file. You can now move it around, use it or send it to a friend :)
+ you will find a file called "gnue-common-0.7.0.exe" in the Output
+ subdirectory - in our example this would be
+ "D:\TMP\gnue-common-0.7.0\packaging\win32\Output". This is your freshly
+ built setup file.
- As stated above you can completely remove the "D:\TMP\gnue-common-0.6.9"
- folder. Please note that the postfix "0.6.9" depends on which version of
+ As stated above you can completely remove the "D:\TMP\gnue-common-0.7.0"
+ folder. Please note that the postfix "0.7.0" depends on which version of
GNUe Common you've downloaded.
Modified: trunk/gnue-common/packaging/win32/README.runtime
===================================================================
--- trunk/gnue-common/packaging/win32/README.runtime 2009-12-12 14:29:05 UTC
(rev 10126)
+++ trunk/gnue-common/packaging/win32/README.runtime 2009-12-14 16:03:19 UTC
(rev 10127)
@@ -30,6 +30,6 @@
1. Download gnue-common-*.zip and unpack it into a temporary folder.
-2. Change to the packaging/win32 directory and run mk-runtime.cmd
+2. Change to the packaging/win32 directory and run make-package-runtime.cmd
-3. The installer .exe will be generated in that directory.
+3. The installer .exe will be generated in the Output subdirectory.
Added: trunk/gnue-common/packaging/win32/compile-iss.py
===================================================================
--- trunk/gnue-common/packaging/win32/compile-iss.py
(rev 0)
+++ trunk/gnue-common/packaging/win32/compile-iss.py 2009-12-14 16:03:19 UTC
(rev 10127)
@@ -0,0 +1,21 @@
+# Python script to call the Inno Setup Compiler, which usually is not in
+# %PATH%. Written by Reinhard Mueller for the GNU Enterprise project.
+# This code is in the public domain.
+
+import os
+import sys
+import win32api
+import win32con
+
+key = win32api.RegOpenKey(
+ win32con.HKEY_LOCAL_MACHINE,
+ "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall"
+ "\\Inno Setup 5_is1",
+ 0,
+ win32con.KEY_READ)
+try:
+ directory = win32api.RegQueryValueEx(key, "InstallLocation")[0]
+finally:
+ win32api.RegCloseKey(key)
+
+os.spawnv(os.P_WAIT, directory + "iscc.exe", ["iscc.exe"] + sys.argv[1:])
Modified: trunk/gnue-common/packaging/win32/gnue-common.iss.dist_template
===================================================================
--- trunk/gnue-common/packaging/win32/gnue-common.iss.dist_template
2009-12-12 14:29:05 UTC (rev 10126)
+++ trunk/gnue-common/packaging/win32/gnue-common.iss.dist_template
2009-12-14 16:03:19 UTC (rev 10127)
@@ -1,6 +1,3 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
[Setup]
AppId=GNUe-Common
AppName=:TITLE:
@@ -16,66 +13,60 @@
ChangesAssociations=true
CreateAppDir=true
ShowLanguageDialog=yes
-OutputDir=C:\GNUe\dist
-OutputBaseFilename=:PACKAGE:-:VERSION:
+OutputBaseFilename=:PACKAGE:-:VERSION:.win32-py25
DisableDirPage=true
-[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-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
+Source: C:\TMP\GNUe\Bin\gnue-schema.exe; DestDir: {app}\Bin; Components: main;
Flags: ignoreversion
+Source: C:\TMP\GNUe\Bin\gnue\*.*; DestDir: {app}\Bin\gnue; Components: main;
Flags: ignoreversion
+Source: C:\TMP\GNUe\Bin\gnue\common\*.*; DestDir: {app}\Bin\gnue\common;
Flags: recursesubdirs ignoreversion; Components: main
+Source: C:\TMP\GNUe\Config\gnue.conf; DestDir: {app}\Config; Components: main;
Flags: onlyifdoesntexist
+Source: C:\TMP\GNUe\Config\backends.conf; DestDir: {app}\Config; Components:
main; Flags: onlyifdoesntexist
+Source: C:\TMP\GNUe\share\locale\gnue-common.mo; DestDir: {app}\share\locale\;
Flags: recursesubdirs createallsubdirs; Components: translations
+Source: C:\TMP\GNUe\share\doc\gnue-common\*.*; DestDir:
{app}\share\doc\gnue-common; Flags: recursesubdirs; Components: doc
+Source: C:\TMP\GNUe\share\gnue\*.*; DestDir: {app}\share\gnue\; Components:
main; Flags: recursesubdirs createallsubdirs
+[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\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
+
[UninstallDelete]
Type: filesandordirs; Name: {app}\Bin\gnue\common\*.*
-Type: files; Name: {app}\Bin\gnue-schema.exe
Type: files; Name: {app}\Bin\gnue\*.*
+[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
+
[Code]
function GetPathInstalled(AppID: String): String;
var
- sPrevPath: String;
+ sPrevPath: String;
begin
sPrevPath := '';
- if not RegQueryStringValue( HKLM,
+ if not RegQueryStringValue(HKLM,
'Software\Microsoft\Windows\CurrentVersion\Uninstall\'+AppID+'_is1',
'Inno Setup: App Path', sPrevpath) then
- RegQueryStringValue( HKCU,
'Software\Microsoft\Windows\CurrentVersion\Uninstall\'+AppID+'_is1' ,
+ RegQueryStringValue(HKCU,
'Software\Microsoft\Windows\CurrentVersion\Uninstall\'+AppID+'_is1' ,
'Inno Setup: App Path', sPrevpath);
-
Result := sPrevPath;
end;
-
function InitializeSetup(): Boolean;
var
- sPrevPath: String;
- sPrevID: String;
+ sPrevPath: String;
+ sPrevID: String;
begin
sPrevID := 'GNUe-Tools';
- sPrevPath := GetPathInstalled( sprevID );
-
- if ( Length(sPrevPath) > 0 ) then
+ sPrevPath := GetPathInstalled(sprevID);
+ if (Length(sPrevPath) > 0) then
Result := true
else
begin
- MsgBox( 'GNUe-Runtime-Environment is not installed!', mbInformation,
MB_OK );
+ MsgBox('GNUe-Runtime-Environment is not installed!', mbInformation,
MB_OK);
Result := false;
end;
end;
-[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
Copied: trunk/gnue-common/packaging/win32/gnue-runtime-environment.iss (from
rev 10124, trunk/gnue-common/packaging/win32/gnue-runtime.iss)
===================================================================
--- trunk/gnue-common/packaging/win32/gnue-runtime-environment.iss
(rev 0)
+++ trunk/gnue-common/packaging/win32/gnue-runtime-environment.iss
2009-12-14 16:03:19 UTC (rev 10127)
@@ -0,0 +1,17 @@
+[Setup]
+AppId=GNUe-Tools
+AppName=GNUe Runtime Environment
+AppVerName=GNUe Runtime Environment 2009.10.31.win32-py2.5
+AppPublisher=GNU Enterprise
+AppPublisherURL=http://www.gnuenterprise.org
+AppSupportURL=http://www.gnuenterprise.org
+AppUpdatesURL=http://www.gnuenterprise.org
+DefaultDirName={pf}\GNUe\
+DefaultGroupName=GNUe
+AllowNoIcons=true
+OutputBaseFilename=gnue-runtime-environment-2009.10.31.win32-py2.5
+
+[Files]
+Source: C:\TMP\GNUe\Bin\*.zip; DestDir: {app}\Bin; Flags: ignoreversion
+Source: C:\TMP\GNUe\Bin\*.dll; DestDir: {app}\Bin; Flags: ignoreversion
+Source: C:\TMP\GNUe\Bin\*.exe; DestDir: {app}\Bin; Flags: ignoreversion
Deleted: trunk/gnue-common/packaging/win32/gnue-runtime.iss
===================================================================
--- trunk/gnue-common/packaging/win32/gnue-runtime.iss 2009-12-12 14:29:05 UTC
(rev 10126)
+++ trunk/gnue-common/packaging/win32/gnue-runtime.iss 2009-12-14 16:03:19 UTC
(rev 10127)
@@ -1,21 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-[Setup]
-AppId=GNUe-Tools
-AppName=GNUe Runtime Environment
-AppVerName=GNUe Runtime Environment 2009.10.31.win32-py2.5
-AppPublisher=GNU Enterprise
-AppPublisherURL=http://www.gnuenterprise.org
-AppSupportURL=http://www.gnuenterprise.org
-AppUpdatesURL=http://www.gnuenterprise.org
-DefaultDirName={pf}\GNUe\
-DefaultGroupName=GNUe
-AllowNoIcons=true
-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
Copied: trunk/gnue-common/packaging/win32/install-runtime.cmd (from rev 10126,
trunk/gnue-common/packaging/win32/mk-runtime.cmd)
===================================================================
--- trunk/gnue-common/packaging/win32/install-runtime.cmd
(rev 0)
+++ trunk/gnue-common/packaging/win32/install-runtime.cmd 2009-12-14
16:03:19 UTC (rev 10127)
@@ -0,0 +1,17 @@
address@hidden OFF
+REM ---------------------------------------------------------------------------
+REM Install GNUe Runtime Environment
+REM
+REM $Id$
+REM ---------------------------------------------------------------------------
+
+IF "%GNUE_PATH%" == "" SET GNUE_PATH=C:\GNUe
+
+PUSHD ..\..
+
+RMDIR /S /Q build
+
+ECHO Installing GNUe Runtime Environment in %GNUE_PATH%
+C:\PYTHON25\PYTHON packaging\win32\setup-runtime.py --quiet py2exe --dist-dir
%GNUE_PATH%\Bin
+
+POPD
Copied: trunk/gnue-common/packaging/win32/install.cmd (from rev 10124,
trunk/gnue-common/packaging/win32/setup.cmd)
===================================================================
--- trunk/gnue-common/packaging/win32/install.cmd
(rev 0)
+++ trunk/gnue-common/packaging/win32/install.cmd 2009-12-14 16:03:19 UTC
(rev 10127)
@@ -0,0 +1,26 @@
address@hidden OFF
+REM ---------------------------------------------------------------------------
+REM Install GNUe Common Library
+REM
+REM $Id$
+REM ---------------------------------------------------------------------------
+
+IF "%GNUE_PATH%" == "" SET GNUE_PATH=C:\GNUe
+
+PUSHD ..\..
+
+IF EXIST build RMDIR /S /Q build
+IF EXIST dist RMDIR /S /Q dist
+
+ECHO Installing GNUe Common Library in %GNUE_PATH%
+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.
+C:\PYTHON25\PYTHON setup.py --quiet install --prefix=%GNUE_PATH%
--install-lib=%GNUE_PATH%\Bin --no-compile
+
+ECHO Creating Windows executable
+REM Run py2exe with a temporary target directory, so we don't overwrite
+REM pre-existing library.zip and friends in Bin.
+C:\PYTHON25\PYTHON packaging\win32\setup.py --quiet py2exe
+COPY dist\gnue-*.exe %GNUE_PATH%\Bin
+
+POPD
Copied: trunk/gnue-common/packaging/win32/make-package-runtime.cmd (from rev
10124, trunk/gnue-common/packaging/win32/mk-runtime.cmd)
===================================================================
--- trunk/gnue-common/packaging/win32/make-package-runtime.cmd
(rev 0)
+++ trunk/gnue-common/packaging/win32/make-package-runtime.cmd 2009-12-14
16:03:19 UTC (rev 10127)
@@ -0,0 +1,18 @@
address@hidden OFF
+REM ---------------------------------------------------------------------------
+REM Create an Installer Package for the GNUe Runtime Environment
+REM
+REM $Id$
+REM ---------------------------------------------------------------------------
+
+SET GNUE_PATH=C:\TMP\GNUe
+
+IF EXIST %GNUE_PATH% RMDIR /S /Q %GNUE_PATH%
+
+CALL install-runtime.cmd
+
+ECHO Creating installer package
+C:\PYTHON25\PYTHON compile-iss.py gnue-runtime-environment.iss /Q
+
+ECHO Cleaning up temporary directory %GNUE_PATH%
+RMDIR /S /Q %GNUE_PATH%
Copied: trunk/gnue-common/packaging/win32/make-package.cmd (from rev 10124,
trunk/gnue-common/packaging/win32/setup.cmd)
===================================================================
--- trunk/gnue-common/packaging/win32/make-package.cmd
(rev 0)
+++ trunk/gnue-common/packaging/win32/make-package.cmd 2009-12-14 16:03:19 UTC
(rev 10127)
@@ -0,0 +1,18 @@
address@hidden OFF
+REM ---------------------------------------------------------------------------
+REM Create an Installer Package for GNUe Common Library
+REM
+REM $Id$
+REM ---------------------------------------------------------------------------
+
+SET GNUE_PATH=C:\TMP\GNUe
+
+IF EXIST %GNUE_PATH% RMDIR /S /Q %GNUE_PATH%
+
+CALL install.cmd
+
+ECHO Creating installer package
+C:\PYTHON25\PYTHON compile-iss.py gnue-common.iss /Q
+
+ECHO Cleaning up temporary directory %GNUE_PATH%
+RMDIR /S /Q %GNUE_PATH%
Deleted: trunk/gnue-common/packaging/win32/mk-runtime.cmd
===================================================================
--- trunk/gnue-common/packaging/win32/mk-runtime.cmd 2009-12-12 14:29:05 UTC
(rev 10126)
+++ trunk/gnue-common/packaging/win32/mk-runtime.cmd 2009-12-14 16:03:19 UTC
(rev 10127)
@@ -1,29 +0,0 @@
address@hidden OFF
-REM ---------------------------------------------------------------------------
-REM Create an Installer Package
-REM
-REM $Id$
-REM ---------------------------------------------------------------------------
-
-REM ---------------------------------------------------------------------------
-REM Prepare the build environment
-REM ---------------------------------------------------------------------------
-
-SET GNUE_PATH="C:\GNUe"
-
-IF EXIST %GNUE_PATH% (
- RMDIR /S /Q %GNUE_PATH%
-)
-
-REM ---------------------------------------------------------------------------
-REM Create executable
-REM ---------------------------------------------------------------------------
-
-C:\PYTHON25\PYTHON setup-runtime.py py2exe -c -d %GNUE_PATH%\Bin
-
-REM ---------------------------------------------------------------------------
-REM Clean up build environment
-REM ---------------------------------------------------------------------------
-
-COPY %GNUE_PATH%\dist\*.exe .
-RMDIR /S /Q %GNUE_PATH%
Modified: trunk/gnue-common/packaging/win32/setup-runtime.py
===================================================================
--- trunk/gnue-common/packaging/win32/setup-runtime.py 2009-12-12 14:29:05 UTC
(rev 10126)
+++ trunk/gnue-common/packaging/win32/setup-runtime.py 2009-12-14 16:03:19 UTC
(rev 10127)
@@ -21,36 +21,12 @@
#
# $Id$
-import os
-import sys
import py2exe
-import win32api
-import win32con
from distutils.core import setup
-ISS_FILE = 'gnue-runtime.iss'
# -----------------------------------------------------------------------------
-# Examine the registry to find out where the InnoSetup compiler is located
-# -----------------------------------------------------------------------------
-
-def get_istool():
- root = win32con.HKEY_CLASSES_ROOT
- item = "InnoSetupScriptFile\\shell\\OpenWithISTool"
- try:
- path = None
- key = win32api.RegOpenKeyEx(root, item, 0, win32con.KEY_READ)
- value = win32api.RegQueryValue(key, "command")
- if isinstance(value, basestring):
- path = value.split(' ', 1)[0]
- except:
- pass
-
- return path
-
-
-# -----------------------------------------------------------------------------
# Main routine
# -----------------------------------------------------------------------------
@@ -87,12 +63,6 @@
'curses', 'logging', 'sqlite3', 'xml', 'win32api', 'win32con',
'PIL', 'reportlab', 'mx', 'PIL', 'wx', 'kinterbasdb', 'MySQLdb',
'psycopg2', 'pysqlite2'],
- 'dll_excludes': ['tcl84.dll', 'tk84.dll', 'fbclient.dll']}})
-
-istool = get_istool()
-if not istool:
- print "Cannot find ISTool.exe"
- sys.exit(1)
-
-cmd = istool + ' -compile gnue-runtime.iss'
-os.system(cmd)
+ 'dll_excludes': ["tcl84.dll", "tk84.dll", "fbclient.dll"],
+ 'compressed': True,
+ 'bundle_files': 1}})
Deleted: trunk/gnue-common/packaging/win32/setup.cmd
===================================================================
--- trunk/gnue-common/packaging/win32/setup.cmd 2009-12-12 14:29:05 UTC (rev
10126)
+++ trunk/gnue-common/packaging/win32/setup.cmd 2009-12-14 16:03:19 UTC (rev
10127)
@@ -1,56 +0,0 @@
address@hidden OFF
-REM ---------------------------------------------------------------------------
-REM Create an Installer Package
-REM
-REM $Id$
-REM ---------------------------------------------------------------------------
-
-REM ---------------------------------------------------------------------------
-REM Prepare the build environment
-REM ---------------------------------------------------------------------------
-
address@hidden Setting up the build environment ...
-SET GNUE_PATH="C:\GNUe"
-
-IF EXIST %GNUE_PATH% (
- RMDIR /S /Q %GNUE_PATH%
-)
-MKDIR %GNUE_PATH%
-MKDIR %GNUE_PATH%\Scripts
-
-COPY setup.py %GNUE_PATH%\Scripts
-COPY gnue-common.iss %GNUE_PATH%\Scripts
-
-REM ---------------------------------------------------------------------------
-REM Install the package into python's site-packages
-REM ---------------------------------------------------------------------------
-
-CD ..\..
address@hidden Installing the package into local site-packages ...
-
-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
-C:\PYTHON25\PYTHON setup.py install --prefix=%GNUE_PATH%
--install-lib=%GNUE_PATH%\bin --no-compile
-
-
-REM ---------------------------------------------------------------------------
-REM Compile everything into an exe
-REM ---------------------------------------------------------------------------
-
-CD packaging\win32
-
address@hidden Building EXE-File ...
-PUSHD %GNUE_PATH%\Scripts
-
-C:\PYTHON25\PYTHON setup.py py2exe -c -d %GNUE_PATH%\Bin
-
-POPD
-
-REM Catch the built EXE and clean up the build environment
-IF EXIST %GNUE_PATH%\dist\*.exe (
- COPY %GNUE_PATH%\dist\*.exe .
- RMDIR /S /Q %GNUE_PATH%
- @ECHO Package completed
-)
-
-:EXIT
Modified: trunk/gnue-common/packaging/win32/setup.py
===================================================================
--- trunk/gnue-common/packaging/win32/setup.py 2009-12-12 14:29:05 UTC (rev
10126)
+++ trunk/gnue-common/packaging/win32/setup.py 2009-12-14 16:03:19 UTC (rev
10127)
@@ -22,23 +22,19 @@
# $Id$
import os
-import sys
import py2exe
-import win32api
-import win32con
from distutils.core import setup
+
# -----------------------------------------------------------------------------
# Constants used by this setup
# -----------------------------------------------------------------------------
# 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', 'backends.conf']
-# The InnoSetup configuration file
-ISS_FILE = 'gnue-common.iss'
+CFG_FILES = ["gnue.conf", "backends.conf"]
# -----------------------------------------------------------------------------
@@ -51,16 +47,15 @@
"""
setup(
- console = ['gnue-schema'],
- options = {"py2exe":
- {"dll_excludes": ["msvcp60.dll",
- "tcl84.dll",
- "tk84.dll",
- "oci.dll"],
- "excludes": ["gnue", "wx", "mx", "PIL"]
- }
- }
- )
+ console = ["scripts/gnue-schema"],
+ options = {
+ 'py2exe': {
+ 'dll_excludes': [
+ "msvcp60.dll", "tcl84.dll", "tk84.dll", "oci.dll"],
+ 'excludes': ["gnue", "wx", "mx", "PIL"]}})
+ 'excludes': ["gnue", "wx", "mx", "PIL"],
+ 'compressed': True,
+ 'bundle_files': 1}})
# -----------------------------------------------------------------------------
@@ -73,48 +68,15 @@
"""
for name in CFG_FILES:
- fhd = open(os.path.join(GNUE_PATH, 'Config', name))
+ fhd = open(os.path.join(GNUE_PATH, "Config", name))
data = [line.strip() for line in fhd.readlines()]
fhd.close()
- out = open(os.path.join(GNUE_PATH, 'Config', name), 'wb')
+ out = open(os.path.join(GNUE_PATH, "Config", name), 'wb')
for line in data:
out.write('%s%s' % (line, os.linesep))
out.close()
-# -----------------------------------------------------------------------------
-# Examine the registry to find out where the InnoSetup compiler is located
-# -----------------------------------------------------------------------------
-
-def get_istool():
- root = win32con.HKEY_CLASSES_ROOT
- item = "InnoSetupScriptFile\\shell\\OpenWithISTool"
- try:
- path = None
- key = win32api.RegOpenKeyEx(root, item, 0, win32con.KEY_READ)
- value = win32api.RegQueryValue(key, "command")
- if isinstance(value, basestring):
- path = value.split(' ', 1)[0]
- except:
- pass
-
- return path
-
-# -----------------------------------------------------------------------------
-# Compile the setup
-# -----------------------------------------------------------------------------
-
-def compile_setup():
-
- istool = get_istool()
- if not istool:
- print "Cannot find ISTool.exe"
- sys.exit(1)
-
- cmd = '%s -compile %s' % (istool, ISS_FILE)
- os.system(cmd)
-
-
# =============================================================================
# Main program
# =============================================================================
@@ -122,5 +84,3 @@
create_exe_files()
finalize_build_env()
-
-compile_setup()
Modified: trunk/gnue-forms/packaging/win32/README.self-contained-installer
===================================================================
--- trunk/gnue-forms/packaging/win32/README.self-contained-installer
2009-12-12 14:29:05 UTC (rev 10126)
+++ trunk/gnue-forms/packaging/win32/README.self-contained-installer
2009-12-14 16:03:19 UTC (rev 10127)
@@ -7,18 +7,11 @@
2. Extract the source ZIP distributions of gnue-common and gnue-forms into a
temporary directory (say C:\TMP).
-3. In C:\TMP\gnue-forms-x.x.x\packaging\win32\setup.cmd, remove the lines at
- the top and at the bottom which would delete C:\GNUe, and run the script
- afterwards.
+3. Run C:\TMP\gnue-common-x.x.x\packaging\win32\install-runtime.cmd
-4. In C:\TMP\gnue-common-x.x.x\packaging\win32\setup.cmd, remove the lines at
- the top and at the bottom which would delete C:\GNUe, and run the script
- afterwards.
+4. Run C:\TMP\gnue-common-x.x.x\packaging\win32\install.cmd
-5. In C:\TMP\gnue-common-x.x.x\packaging\win32\mk-runtime.cmd, remove the lines
- at the top and at the bottom which would delete C:\GNUe, and run the script
- afterwards. It is important that this is done as the last one, since this
- will create the correct library.zip while 3. and 4. will create wrong ones.
+5. Run C:\TMP\gnue-forms-x.x.x\packaging\win32\install.cmd
6. Create a directory C:\GNUe\Forms and copy your GFDs there.
Added: trunk/gnue-forms/packaging/win32/compile-iss.py
===================================================================
--- trunk/gnue-forms/packaging/win32/compile-iss.py
(rev 0)
+++ trunk/gnue-forms/packaging/win32/compile-iss.py 2009-12-14 16:03:19 UTC
(rev 10127)
@@ -0,0 +1,21 @@
+# Python script to call the Inno Setup Compiler, which usually is not in
+# %PATH%. Written by Reinhard Mueller for the GNU Enterprise project.
+# This code is in the public domain.
+
+import os
+import sys
+import win32api
+import win32con
+
+key = win32api.RegOpenKey(
+ win32con.HKEY_LOCAL_MACHINE,
+ "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall"
+ "\\Inno Setup 5_is1",
+ 0,
+ win32con.KEY_READ)
+try:
+ directory = win32api.RegQueryValueEx(key, "InstallLocation")[0]
+finally:
+ win32api.RegCloseKey(key)
+
+os.spawnv(os.P_WAIT, directory + "iscc.exe", ["iscc.exe"] + sys.argv[1:])
Modified: trunk/gnue-forms/packaging/win32/gnue-forms.iss.dist_template
===================================================================
--- trunk/gnue-forms/packaging/win32/gnue-forms.iss.dist_template
2009-12-12 14:29:05 UTC (rev 10126)
+++ trunk/gnue-forms/packaging/win32/gnue-forms.iss.dist_template
2009-12-14 16:03:19 UTC (rev 10127)
@@ -1,6 +1,3 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
[Setup]
AppId=GNUe-Forms
AppName=:TITLE:
@@ -16,22 +13,16 @@
ChangesAssociations=true
CreateAppDir=true
ShowLanguageDialog=yes
-OutputDir=C:\GNUe\dist
-OutputBaseFilename=:PACKAGE:-:VERSION:
+OutputBaseFilename=:PACKAGE:-:VERSION:.win32-py25
DisableDirPage=true
AppendDefaultDirName=false
-[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:\TMP\GNUe\Bin\gnue-forms.exe; DestDir: {app}\Bin; Components: main;
Flags: ignoreversion
+Source: C:\TMP\GNUe\Bin\gnue\forms\*.*; DestDir: {app}\Bin\gnue\forms; Flags:
recursesubdirs ignoreversion; Components: main
+Source: C:\TMP\GNUe\share\locale\gnue-forms.mo; DestDir: {app}\share\locale\;
Flags: recursesubdirs createallsubdirs; Components: translations
+Source: C:\TMP\GNUe\share\doc\gnue-forms\*.*; DestDir:
{app}\share\doc\gnue-forms; Flags: recursesubdirs; Components: doc
+Source: C:\TMP\GNUe\share\gnue\*.*; DestDir: {app}\share\gnue\; Components:
main; Flags: recursesubdirs createallsubdirs
[Registry]
; These four associations associate GFD files with GNUe Forms
@@ -44,42 +35,44 @@
[UninstallDelete]
Name: {app}\Bin\gnue\forms\*.*; Type: filesandordirs
+[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
+
[Code]
function GetPathInstalled(AppID: String): String;
var
sPrevPath: String;
begin
sPrevPath := '';
- if not RegQueryStringValue( HKLM,
+ if not RegQueryStringValue(HKLM,
'Software\Microsoft\Windows\CurrentVersion\Uninstall\'+AppID+'_is1',
'Inno Setup: App Path', sPrevpath) then
- RegQueryStringValue( HKCU,
'Software\Microsoft\Windows\CurrentVersion\Uninstall\'+AppID+'_is1' ,
+ RegQueryStringValue(HKCU,
'Software\Microsoft\Windows\CurrentVersion\Uninstall\'+AppID+'_is1',
'Inno Setup: App Path', sPrevpath);
Result := sPrevPath;
end;
-
function InitializeSetup(): Boolean;
var
- sPrevPath: String;
- sPrevID: String;
+ sPrevPath: String;
+ sPrevID: String;
begin
sPrevID := 'GNUe-Tools';
- sPrevPath := GetPathInstalled( sprevID );
-
- if ( Length(sPrevPath) > 0 ) then
+ sPrevPath := GetPathInstalled(sprevID);
+ if (Length(sPrevPath) > 0) then
Result := true
else
begin
- MsgBox( 'GNUe-Runtime-Environment is not installed!', mbInformation,
MB_OK );
+ MsgBox('GNUe-Runtime-Environment is not installed!', mbInformation,
MB_OK);
Result := false;
end;
-
if (Length(GetPathInstalled('GNUe-Common')) > 0) then
- Result := true
+ Result := true
else begin
- MsgBox('GNUe-Common is not installed! Please install the GNUe-Common
package in order to setup GNUe-Forms.', mbInformation, MB_OK);
- Result := false;
+ MsgBox('GNUe-Common is not installed! Please install the GNUe-Common
package in order to setup GNUe-Forms.', mbInformation, MB_OK);
+ Result := false;
end;
end;
Copied: trunk/gnue-forms/packaging/win32/install.cmd (from rev 10124,
trunk/gnue-forms/packaging/win32/setup.cmd)
===================================================================
--- trunk/gnue-forms/packaging/win32/install.cmd
(rev 0)
+++ trunk/gnue-forms/packaging/win32/install.cmd 2009-12-14 16:03:19 UTC
(rev 10127)
@@ -0,0 +1,26 @@
address@hidden OFF
+REM ---------------------------------------------------------------------------
+REM Install GNUe Forms
+REM
+REM $Id$
+REM ---------------------------------------------------------------------------
+
+IF "%GNUE_PATH%" == "" SET GNUE_PATH=C:\GNUe
+
+PUSHD ..\..
+
+IF EXIST build RMDIR /S /Q build
+IF EXIST dist RMDIR /S /Q dist
+
+ECHO Installing GNUe Forms in %GNUE_PATH%
+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.
+C:\PYTHON25\PYTHON setup.py --quiet install
--install-scripts=%GNUE_PATH%\Scripts --install-lib=%GNUE_PATH%\Bin
--install-data=%GNUE_PATH% --install-config=%GNUE_PATH%\Config --no-compile
+
+ECHO Creating Windows executable
+REM Run py2exe with a temporary target directory, so we don't overwrite
+REM pre-existing library.zip and friends in Bin.
+C:\PYTHON25\PYTHON packaging\win32\setup.py --quiet py2exe
+COPY dist\gnue-*.exe %GNUE_PATH%\Bin
+
+POPD
Copied: trunk/gnue-forms/packaging/win32/make-package.cmd (from rev 10124,
trunk/gnue-forms/packaging/win32/setup.cmd)
===================================================================
--- trunk/gnue-forms/packaging/win32/make-package.cmd
(rev 0)
+++ trunk/gnue-forms/packaging/win32/make-package.cmd 2009-12-14 16:03:19 UTC
(rev 10127)
@@ -0,0 +1,18 @@
address@hidden OFF
+REM ---------------------------------------------------------------------------
+REM Create an Installer Package for GNUe Forms
+REM
+REM $Id$
+REM ---------------------------------------------------------------------------
+
+SET GNUE_PATH=C:\TMP\GNUe
+
+IF EXIST %GNUE_PATH% RMDIR /S /Q %GNUE_PATH%
+
+CALL install.cmd
+
+ECHO Creating installer package
+C:\PYTHON25\PYTHON compile-iss.py gnue-forms.iss /Q
+
+ECHO Cleaning up temporary directory %GNUE_PATH%
+RMDIR /S /Q %GNUE_PATH%
Deleted: trunk/gnue-forms/packaging/win32/setup.cmd
===================================================================
--- trunk/gnue-forms/packaging/win32/setup.cmd 2009-12-12 14:29:05 UTC (rev
10126)
+++ trunk/gnue-forms/packaging/win32/setup.cmd 2009-12-14 16:03:19 UTC (rev
10127)
@@ -1,58 +0,0 @@
address@hidden OFF
-REM ---------------------------------------------------------------------------
-REM Create an Installer Package for GNUe Forms
-REM
-REM $Id$
-REM ---------------------------------------------------------------------------
-
-REM ---------------------------------------------------------------------------
-REM Prepare the build environment
-REM ---------------------------------------------------------------------------
-
address@hidden Setting up the build environment ...
-SET GNUE_PATH="C:\GNUe"
-
-IF EXIST %GNUE_PATH% (
- RMDIR /S /Q %GNUE_PATH%
-)
-MKDIR %GNUE_PATH%
-MKDIR %GNUE_PATH%\Scripts
-
-COPY setup.py %GNUE_PATH%\Scripts
-COPY gnue-32x32.ico %GNUE_PATH%\Scripts
-COPY gnue-forms.iss %GNUE_PATH%\Scripts
-
-REM ---------------------------------------------------------------------------
-REM Install the package into the build environment
-REM ---------------------------------------------------------------------------
-
-CD ..\..
address@hidden Installing the package into local build environment ...
-
-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.
-
-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 ---------------------------------------------------------------------------
-REM Compile everything into an exe
-REM ---------------------------------------------------------------------------
-
-CD packaging\win32
-
address@hidden Building EXE-File ...
-PUSHD %GNUE_PATH%\Scripts
-
-C:\PYTHON25\PYTHON setup.py py2exe -c -d %GNUE_PATH%\Bin
-
-POPD
-
-REM Catch the built EXE and clean up the build environment
-IF EXIST %GNUE_PATH%\dist\*.exe (
- COPY %GNUE_PATH%\dist\*.exe .
- RMDIR /S /Q %GNUE_PATH%
- @ECHO Package completed
-)
-
-:EXIT
Modified: trunk/gnue-forms/packaging/win32/setup.py
===================================================================
--- trunk/gnue-forms/packaging/win32/setup.py 2009-12-12 14:29:05 UTC (rev
10126)
+++ trunk/gnue-forms/packaging/win32/setup.py 2009-12-14 16:03:19 UTC (rev
10127)
@@ -1,4 +1,4 @@
-# GNU Enterprise Common - Setup Script for py2exe
+# GNU Enterprise Forms - Setup Script for py2exe
#
# Copyright 2001-2009 Free Software Foundation
#
@@ -21,25 +21,11 @@
#
# $Id$
-import os
-import sys
import py2exe
-import win32api
-import win32con
from distutils.core import setup
-# -----------------------------------------------------------------------------
-# Constants used by this setup
-# -----------------------------------------------------------------------------
-# 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 = []
-# The InnoSetup configuration file
-ISS_FILE = 'gnue-forms.iss'
-
# The manifest will be inserted as resource into .exe files. This
# gives the controls the Windows XP appearance (if run on XP).
manifest = '''
@@ -67,113 +53,16 @@
</assembly>
'''
-RT_MANIFEST = 24
-
-
-# -----------------------------------------------------------------------------
-# 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():
- """
- Create gnue-schema.exe (which is currently the only exe supplied by
- gnue-common.
- """
-
- setup( \
- windows = [{"script": "gnue-forms",
- "icon_resources": [(1, "gnue-32x32.ico")],
- "other_resources": [(RT_MANIFEST, 1, manifest)]}],
- options = {"py2exe":
- {"dll_excludes": ["msvcp60.dll",
- "tcl84.dll",
- "tk84.dll",
- "oci.dll"],
- "excludes": ["gnue.forms", "wx", "mx", "PIL"]
- }
- }
- )
-
-
-# -----------------------------------------------------------------------------
-# 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, 'etc', 'sample.%s' % name))
- data = [line.strip() for line in fhd.readlines()]
- out = open(os.path.join(GNUE_PATH, 'etc', name), '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
-# -----------------------------------------------------------------------------
-
-def get_istool():
- root = win32con.HKEY_CLASSES_ROOT
- item = "InnoSetupScriptFile\\shell\\OpenWithISTool"
- try:
- path = None
- key = win32api.RegOpenKeyEx(root, item, 0, win32con.KEY_READ)
- value = win32api.RegQueryValue(key, "command")
- if isinstance(value, basestring):
- path = value.split(' ', 1)[0]
- except:
- pass
-
- return path
-
-# -----------------------------------------------------------------------------
-# Compile the setup
-# -----------------------------------------------------------------------------
-
-def compile_setup():
-
- istool = get_istool()
- if not istool:
- print "Cannot find ISTool.exe"
- sys.exit(1)
-
- cmd = '%s -compile %s' % (istool, ISS_FILE)
- os.system(cmd)
-
-
-# =============================================================================
-# Main program
-# =============================================================================
-
-create_exe_files()
-
-finalize_build_env()
-
-compile_setup()
+setup(
+ windows = [
+ {
+ 'script': "scripts/gnue-forms",
+ 'icon_resources': [(1, "packaging/win32/gnue-32x32.ico")],
+ 'other_resources': [(24, 1, manifest)]}],
+ options = {
+ 'py2exe': {
+ 'dll_excludes': [
+ "msvcp60.dll", "tcl84.dll", "tk84.dll", "oci.dll"],
+ 'excludes': ["gnue.forms", "wx", "mx", "PIL"],
+ 'compressed': True,
+ 'bundle_files': 1}})
Added: trunk/gnue-navigator/packaging/win32/compile-iss.py
===================================================================
--- trunk/gnue-navigator/packaging/win32/compile-iss.py
(rev 0)
+++ trunk/gnue-navigator/packaging/win32/compile-iss.py 2009-12-14 16:03:19 UTC
(rev 10127)
@@ -0,0 +1,21 @@
+# Python script to call the Inno Setup Compiler, which usually is not in
+# %PATH%. Written by Reinhard Mueller for the GNU Enterprise project.
+# This code is in the public domain.
+
+import os
+import sys
+import win32api
+import win32con
+
+key = win32api.RegOpenKey(
+ win32con.HKEY_LOCAL_MACHINE,
+ "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall"
+ "\\Inno Setup 5_is1",
+ 0,
+ win32con.KEY_READ)
+try:
+ directory = win32api.RegQueryValueEx(key, "InstallLocation")[0]
+finally:
+ win32api.RegCloseKey(key)
+
+os.spawnv(os.P_WAIT, directory + "iscc.exe", ["iscc.exe"] + sys.argv[1:])
Modified: trunk/gnue-navigator/packaging/win32/gnue-navigator.iss.dist_template
===================================================================
--- trunk/gnue-navigator/packaging/win32/gnue-navigator.iss.dist_template
2009-12-12 14:29:05 UTC (rev 10126)
+++ trunk/gnue-navigator/packaging/win32/gnue-navigator.iss.dist_template
2009-12-14 16:03:19 UTC (rev 10127)
@@ -1,6 +1,3 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
[Setup]
AppId=GNUe-Navigator
AppName=:TITLE:
@@ -16,21 +13,15 @@
ChangesAssociations=true
CreateAppDir=true
ShowLanguageDialog=yes
-OutputDir=C:\GNUe\dist
-OutputBaseFilename=:PACKAGE:-:VERSION:
+OutputBaseFilename=:PACKAGE:-:VERSION:.py25-win32
DisableDirPage=true
AppendDefaultDirName=false
-[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-navigator.exe; DestDir: {app}\Bin; Components: main;
Flags: ignoreversion
-Source: C:\GNUe\Bin\gnue\navigator\*.*; DestDir: {app}\Bin\gnue\navigator;
Flags: recursesubdirs ignoreversion; Components: main
-Source: C:\GNUe\share\locale\gnue-navigator.mo; DestDir: {app}\share\locale\;
Flags: recursesubdirs createallsubdirs; Components: translations
-Source: C:\GNUe\share\doc\gnue-navigator\*.*; DestDir:
{app}\share\doc\gnue-navigator; Flags: recursesubdirs; Components: doc
+Source: C:\TMP\GNUe\Bin\gnue-navigator.exe; DestDir: {app}\Bin; Components:
main; Flags: ignoreversion
+Source: C:\TMP\GNUe\Bin\gnue\navigator\*.*; DestDir: {app}\Bin\gnue\navigator;
Flags: recursesubdirs ignoreversion; Components: main
+Source: C:\TMP\GNUe\share\locale\gnue-navigator.mo; DestDir:
{app}\share\locale\; Flags: recursesubdirs createallsubdirs; Components:
translations
+Source: C:\TMP\GNUe\share\doc\gnue-navigator\*.*; DestDir:
{app}\share\doc\gnue-navigator; Flags: recursesubdirs; Components: doc
[Registry]
; These four associations associate GPD files with GNUe Navigator
@@ -43,10 +34,15 @@
[UninstallDelete]
Name: {app}\Bin\gnue\navigator\*.*; Type: filesandordirs
+[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
+
[Code]
function GetPathInstalled(AppID: String): String;
var
- sPrevPath: String;
+ sPrevPath: String;
begin
sPrevPath := '';
if not RegQueryStringValue( HKLM,
@@ -54,33 +50,29 @@
'Inno Setup: App Path', sPrevpath) then
RegQueryStringValue( HKCU,
'Software\Microsoft\Windows\CurrentVersion\Uninstall\'+AppID+'_is1' ,
'Inno Setup: App Path', sPrevpath);
-
Result := sPrevPath;
end;
function InitializeSetup(): Boolean;
var
- sPrevPath: String;
- sPrevID: String;
+ sPrevPath: String;
+ sPrevID: String;
begin
sPrevID := 'GNUe-Tools';
sPrevPath := GetPathInstalled( sprevID );
-
if ( Length(sPrevPath) > 0 ) then
- Result := true
+ Result := true
else begin
- MsgBox( 'GNUe-Runtime-Environment is not installed!', mbInformation,
MB_OK );
- Result := false;
+ MsgBox( 'GNUe-Runtime-Environment is not installed!', mbInformation, MB_OK
);
+ Result := false;
end;
-
if (Length(GetPathInstalled('GNUe-Common')) > 0) then
- Result := true
+ Result := true
else begin
- MsgBox('GNUe-Common is not installed! Please install the GNUe-Common
package in order to setup GNUe-Navigator.', mbInformation, MB_OK);
- Result := false;
+ MsgBox('GNUe-Common is not installed! Please install the GNUe-Common
package in order to setup GNUe-Navigator.', mbInformation, MB_OK);
+ Result := false;
end;
-
if (Length(GetPathInstalled('GNUe-Forms')) > 0) then
Result := true
else begin
Copied: trunk/gnue-navigator/packaging/win32/install.cmd (from rev 10124,
trunk/gnue-navigator/packaging/win32/setup.cmd)
===================================================================
--- trunk/gnue-navigator/packaging/win32/install.cmd
(rev 0)
+++ trunk/gnue-navigator/packaging/win32/install.cmd 2009-12-14 16:03:19 UTC
(rev 10127)
@@ -0,0 +1,26 @@
address@hidden OFF
+REM ---------------------------------------------------------------------------
+REM Install GNUe Navigator
+REM
+REM $Id$
+REM ---------------------------------------------------------------------------
+
+IF "%GNUE_PATH%" == "" SET GNUE_PATH=C:\GNUe
+
+PUSHD ..\..
+
+IF EXIST build RMDIR /S /Q build
+IF EXIST dist RMDIR /S /Q dist
+
+ECHO Installing GNUe Navigator in %GNUE_PATH%
+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.
+C:\PYTHON25\PYTHON setup.py --quiet install
--install-scripts=%GNUE_PATH%\Scripts --install-lib=%GNUE_PATH%\Bin
--install-data=%GNUE_PATH% --install-config=%GNUE_PATH%\Config --no-compile
+
+ECHO Creating Windows executable
+REM Run py2exe with a temporary target directory, so we don't overwrite
+REM pre-existing library.zip and friends in Bin.
+C:\PYTHON25\PYTHON packaging\win32\setup.py --quiet py2exe
+COPY dist\gnue-*.exe %GNUE_PATH%\Bin
+
+POPD
Copied: trunk/gnue-navigator/packaging/win32/make-package.cmd (from rev 10124,
trunk/gnue-navigator/packaging/win32/setup.cmd)
===================================================================
--- trunk/gnue-navigator/packaging/win32/make-package.cmd
(rev 0)
+++ trunk/gnue-navigator/packaging/win32/make-package.cmd 2009-12-14
16:03:19 UTC (rev 10127)
@@ -0,0 +1,18 @@
address@hidden OFF
+REM ---------------------------------------------------------------------------
+REM Create an Installer Package for GNUe Navigator
+REM
+REM $Id$
+REM ---------------------------------------------------------------------------
+
+SET GNUE_PATH=C:\TMP\GNUe
+
+IF EXIST %GNUE_PATH% RMDIR /S /Q %GNUE_PATH%
+
+CALL install.cmd
+
+ECHO Creating installer package
+C:\PYTHON25\PYTHON compile-iss.py gnue-navigator.iss /Q
+
+ECHO Cleaning up temporary directory %GNUE_PATH%
+RMDIR /S /Q %GNUE_PATH%
Deleted: trunk/gnue-navigator/packaging/win32/setup.cmd
===================================================================
--- trunk/gnue-navigator/packaging/win32/setup.cmd 2009-12-12 14:29:05 UTC
(rev 10126)
+++ trunk/gnue-navigator/packaging/win32/setup.cmd 2009-12-14 16:03:19 UTC
(rev 10127)
@@ -1,58 +0,0 @@
address@hidden OFF
-REM ---------------------------------------------------------------------------
-REM Create an Installer Package for GNUe Navigator
-REM
-REM $Id$
-REM ---------------------------------------------------------------------------
-
-REM ---------------------------------------------------------------------------
-REM Prepare the build environment
-REM ---------------------------------------------------------------------------
-
address@hidden Setting up the build environment ...
-SET GNUE_PATH="C:\GNUe"
-
-IF EXIST %GNUE_PATH% (
- RMDIR /S /Q %GNUE_PATH%
-)
-MKDIR %GNUE_PATH%
-MKDIR %GNUE_PATH%\Scripts
-
-COPY setup.py %GNUE_PATH%\Scripts
-COPY gnue-32x32.ico %GNUE_PATH%\Scripts
-COPY gnue-navigator.iss %GNUE_PATH%\Scripts
-
-REM ---------------------------------------------------------------------------
-REM Install the package into the build environment
-REM ---------------------------------------------------------------------------
-
-CD ..\..
address@hidden Installing the package into local build environment ...
-
-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.
-
-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 ---------------------------------------------------------------------------
-REM Compile everything into an exe
-REM ---------------------------------------------------------------------------
-
-CD packaging\win32
-
address@hidden Building EXE-File ...
-PUSHD %GNUE_PATH%\Scripts
-
-C:\PYTHON25\PYTHON setup.py py2exe -c -d %GNUE_PATH%\Bin
-
-POPD
-
-REM Catch the built EXE and clean up the build environment
-IF EXIST %GNUE_PATH%\dist\*.exe (
- COPY %GNUE_PATH%\dist\*.exe .
- RMDIR /S /Q %GNUE_PATH%
- @ECHO Package completed
-)
-
-:EXIT
Modified: trunk/gnue-navigator/packaging/win32/setup.py
===================================================================
--- trunk/gnue-navigator/packaging/win32/setup.py 2009-12-12 14:29:05 UTC
(rev 10126)
+++ trunk/gnue-navigator/packaging/win32/setup.py 2009-12-14 16:03:19 UTC
(rev 10127)
@@ -1,4 +1,4 @@
-# GNU Enterprise Common - Setup Script for py2exe
+# GNU Enterprise Navigator - Setup Script for py2exe
#
# Copyright 2001-2009 Free Software Foundation
#
@@ -21,23 +21,11 @@
#
# $Id$
-import os
-import sys
import py2exe
-import win32api
-import win32con
from distutils.core import setup
-# -----------------------------------------------------------------------------
-# Constants used by this setup
-# -----------------------------------------------------------------------------
-# The path where we are creating the build environment for the setup compiler
-GNUE_PATH='C:\\GNUE'
-# The InnoSetup configuration file
-ISS_FILE = 'gnue-navigator.iss'
-
# The manifest will be inserted as resource into .exe files. This
# gives the controls the Windows XP appearance (if run on XP).
manifest = '''
@@ -65,92 +53,16 @@
</assembly>
'''
-RT_MANIFEST = 24
-
-
-# -----------------------------------------------------------------------------
-# 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():
- """
- Create gnue-schema.exe (which is currently the only exe supplied by
- gnue-common.
- """
-
- setup( \
- windows = [{"script": "gnue-navigator",
- "icon_resources": [(1, "gnue-32x32.ico")],
- "other_resources": [(RT_MANIFEST, 1, manifest)]}],
- options = {"py2exe":
- {"dll_excludes": ["msvcp60.dll",
- "tcl84.dll",
- "tk84.dll",
- "oci.dll"],
- "excludes": ["gnue.navigator", "wx", "mx", "PIL"]
- }
- }
- )
-
-
-# -----------------------------------------------------------------------------
-# Examine the registry to find out where the InnoSetup compiler is located
-# -----------------------------------------------------------------------------
-
-def get_istool():
- root = win32con.HKEY_CLASSES_ROOT
- item = "InnoSetupScriptFile\\shell\\OpenWithISTool"
- try:
- path = None
- key = win32api.RegOpenKeyEx(root, item, 0, win32con.KEY_READ)
- value = win32api.RegQueryValue(key, "command")
- if isinstance(value, basestring):
- path = value.split(' ', 1)[0]
- except:
- pass
-
- return path
-
-# -----------------------------------------------------------------------------
-# Compile the setup
-# -----------------------------------------------------------------------------
-
-def compile_setup():
-
- istool = get_istool()
- if not istool:
- print "Cannot find ISTool.exe"
- sys.exit(1)
-
- cmd = '%s -compile %s' % (istool, ISS_FILE)
- os.system(cmd)
-
-
-# =============================================================================
-# Main program
-# =============================================================================
-
-create_exe_files()
-
-compile_setup()
+setup(
+ windows = [
+ {
+ 'script': "scripts/gnue-navigator",
+ 'icon_resources': [(1, "packaging/win32/gnue-32x32.ico")],
+ 'other_resources': [(24, 1, manifest)]}],
+ options = {
+ 'py2exe': {
+ 'dll_excludes': [
+ "msvcp60.dll", "tcl84.dll", "tk84.dll", "oci.dll"],
+ 'excludes': ["gnue.navigator", "wx", "mx", "PIL"]
+ 'compressed': True,
+ 'bundle_files': 1}})
Added: trunk/gnue-reports/packaging/win32/compile-iss.py
===================================================================
--- trunk/gnue-reports/packaging/win32/compile-iss.py
(rev 0)
+++ trunk/gnue-reports/packaging/win32/compile-iss.py 2009-12-14 16:03:19 UTC
(rev 10127)
@@ -0,0 +1,21 @@
+# Python script to call the Inno Setup Compiler, which usually is not in
+# %PATH%. Written by Reinhard Mueller for the GNU Enterprise project.
+# This code is in the public domain.
+
+import os
+import sys
+import win32api
+import win32con
+
+key = win32api.RegOpenKey(
+ win32con.HKEY_LOCAL_MACHINE,
+ "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall"
+ "\\Inno Setup 5_is1",
+ 0,
+ win32con.KEY_READ)
+try:
+ directory = win32api.RegQueryValueEx(key, "InstallLocation")[0]
+finally:
+ win32api.RegCloseKey(key)
+
+os.spawnv(os.P_WAIT, directory + "iscc.exe", ["iscc.exe"] + sys.argv[1:])
Modified: trunk/gnue-reports/packaging/win32/gnue-reports.iss.dist_template
===================================================================
--- trunk/gnue-reports/packaging/win32/gnue-reports.iss.dist_template
2009-12-12 14:29:05 UTC (rev 10126)
+++ trunk/gnue-reports/packaging/win32/gnue-reports.iss.dist_template
2009-12-14 16:03:19 UTC (rev 10127)
@@ -1,6 +1,3 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
[Setup]
AppId=GNUe-Reports
AppName=:TITLE:
@@ -16,69 +13,61 @@
ChangesAssociations=true
CreateAppDir=true
ShowLanguageDialog=yes
-OutputDir=C:\GNUe\dist
-OutputBaseFilename=:PACKAGE:-:VERSION:
+OutputBaseFilename=:PACKAGE:-:VERSION:.win32-py25
DisableDirPage=true
AppendDefaultDirName=false
-[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\Config\report-filters.conf; DestDir: {app}\Config; Components:
main; Flags: onlyifdoesntexist
+Source: C:\TMP\GNUe\Bin\gnue-reports.exe; DestDir: {app}\Bin; Components:
main; Flags: ignoreversion
+Source: C:\TMP\GNUe\Bin\gnue-reports-server.exe; DestDir: {app}\Bin;
Components: main; Flags: ignoreversion
+Source: C:\TMP\GNUe\Bin\gnue\reports\*.*; DestDir: {app}\Bin\gnue\reports;
Flags: recursesubdirs ignoreversion; Components: main
+Source: C:\TMP\GNUe\Config\report-filters.conf; DestDir: {app}\Config;
Components: main; Flags: onlyifdoesntexist
; FIXME: Remove the following line when gnue-common has been changed to use
"Config" instead of "etc" under Windows
-Source: C:\GNUe\Config\report-filters.conf; DestDir: {app}\etc; Components:
main; Flags: onlyifdoesntexist
-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:\TMP\GNUe\Config\report-filters.conf; DestDir: {app}\etc;
Components: main; Flags: onlyifdoesntexist
+Source: C:\TMP\GNUe\share\locale\gnue-reports.mo; DestDir:
{app}\share\locale\; Flags: recursesubdirs createallsubdirs; Components:
translations
+Source: C:\TMP\GNUe\share\doc\gnue-reports\*.*; DestDir:
{app}\share\doc\gnue-reports; Flags: recursesubdirs; Components: doc
+Source: C:\TMP\GNUe\share\gnue\*.*; DestDir: {app}\share\gnue\; Components:
main; Flags: recursesubdirs createallsubdirs
-[Registry]
-; Place the associations for GRD files with GNUe Reports here (later)
-
[UninstallDelete]
Name: {app}\Bin\gnue\reports\*.*; Type: filesandordirs
+[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
+
[Code]
function GetPathInstalled(AppID: String): String;
var
- sPrevPath: String;
+ sPrevPath: String;
begin
sPrevPath := '';
- if not RegQueryStringValue( HKLM,
+ if not RegQueryStringValue(HKLM,
'Software\Microsoft\Windows\CurrentVersion\Uninstall\'+AppID+'_is1',
'Inno Setup: App Path', sPrevpath) then
- RegQueryStringValue( HKCU,
'Software\Microsoft\Windows\CurrentVersion\Uninstall\'+AppID+'_is1' ,
+ RegQueryStringValue(HKCU,
'Software\Microsoft\Windows\CurrentVersion\Uninstall\'+AppID+'_is1' ,
'Inno Setup: App Path', sPrevpath);
-
Result := sPrevPath;
end;
-
function InitializeSetup(): Boolean;
var
- sPrevPath: String;
- sPrevID: String;
+ sPrevPath: String;
+ sPrevID: String;
begin
sPrevID := 'GNUe-Tools';
- sPrevPath := GetPathInstalled( sprevID );
-
- if ( Length(sPrevPath) > 0 ) then
+ sPrevPath := GetPathInstalled(sprevID);
+ if (Length(sPrevPath) > 0) then
Result := true
else
begin
- MsgBox( 'GNUe-Runtime-Environment is not installed!', mbInformation,
MB_OK );
+ MsgBox('GNUe-Runtime-Environment is not installed!', mbInformation,
MB_OK);
Result := false;
end;
-
if (Length(GetPathInstalled('GNUe-Common')) > 0) then
- Result := true
+ Result := true
else begin
- MsgBox('GNUe-Common is not installed! Please install the GNUe-Common
package in order to setup GNUe-Reports.', mbInformation, MB_OK);
- Result := false;
+ MsgBox('GNUe-Common is not installed! Please install the GNUe-Common
package in order to setup GNUe-Reports.', mbInformation, MB_OK);
+ Result := false;
end;
end;
Copied: trunk/gnue-reports/packaging/win32/install.cmd (from rev 10124,
trunk/gnue-reports/packaging/win32/setup.cmd)
===================================================================
--- trunk/gnue-reports/packaging/win32/install.cmd
(rev 0)
+++ trunk/gnue-reports/packaging/win32/install.cmd 2009-12-14 16:03:19 UTC
(rev 10127)
@@ -0,0 +1,26 @@
address@hidden OFF
+REM ---------------------------------------------------------------------------
+REM Install GNUe Reports
+REM
+REM $Id$
+REM ---------------------------------------------------------------------------
+
+IF "%GNUE_PATH%" == "" SET GNUE_PATH=C:\GNUe
+
+PUSHD ..\..
+
+IF EXIST build RMDIR /S /Q build
+IF EXIST dist RMDIR /S /Q dist
+
+ECHO Installing GNUe Reports in %GNUE_PATH%
+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.
+C:\PYTHON25\PYTHON setup.py --quiet install
--install-scripts=%GNUE_PATH%\Scripts --install-lib=%GNUE_PATH%\Bin
--install-data=%GNUE_PATH% --install-config=%GNUE_PATH%\Config --no-compile
+
+ECHO Creating Windows executable
+REM Run py2exe with a temporary target directory, so we don't overwrite
+REM pre-existing library.zip and friends in Bin.
+C:\PYTHON25\PYTHON packaging\win32\setup.py --quiet py2exe
+COPY dist\gnue-*.exe %GNUE_PATH%\Bin
+
+POPD
Copied: trunk/gnue-reports/packaging/win32/make-package.cmd (from rev 10124,
trunk/gnue-reports/packaging/win32/setup.cmd)
===================================================================
--- trunk/gnue-reports/packaging/win32/make-package.cmd
(rev 0)
+++ trunk/gnue-reports/packaging/win32/make-package.cmd 2009-12-14 16:03:19 UTC
(rev 10127)
@@ -0,0 +1,18 @@
address@hidden OFF
+REM ---------------------------------------------------------------------------
+REM Create an Installer Package for GNUe Reports
+REM
+REM $Id$
+REM ---------------------------------------------------------------------------
+
+SET GNUE_PATH=C:\TMP\GNUe
+
+IF EXIST %GNUE_PATH% RMDIR /S /Q %GNUE_PATH%
+
+CALL install.cmd
+
+ECHO Creating installer package
+C:\PYTHON25\PYTHON compile-iss.py gnue-reports.iss /Q
+
+ECHO Cleaning up temporary directory %GNUE_PATH%
+RMDIR /S /Q %GNUE_PATH%
Deleted: trunk/gnue-reports/packaging/win32/setup.cmd
===================================================================
--- trunk/gnue-reports/packaging/win32/setup.cmd 2009-12-12 14:29:05 UTC
(rev 10126)
+++ trunk/gnue-reports/packaging/win32/setup.cmd 2009-12-14 16:03:19 UTC
(rev 10127)
@@ -1,58 +0,0 @@
address@hidden OFF
-REM ---------------------------------------------------------------------------
-REM Create an Installer Package for GNUe Reports
-REM
-REM $Id$
-REM ---------------------------------------------------------------------------
-
-REM ---------------------------------------------------------------------------
-REM Prepare the build environment
-REM ---------------------------------------------------------------------------
-
address@hidden Setting up the build environment ...
-SET GNUE_PATH="C:\GNUe"
-
-IF EXIST %GNUE_PATH% (
- RMDIR /S /Q %GNUE_PATH%
-)
-MKDIR %GNUE_PATH%
-MKDIR %GNUE_PATH%\Scripts
-MKDIR %GNUE_PATH%\Config
-
-COPY setup.py %GNUE_PATH%\Scripts
-COPY gnue-reports.iss %GNUE_PATH%\Scripts
-
-REM ---------------------------------------------------------------------------
-REM Install the package into the build environment
-REM ---------------------------------------------------------------------------
-
-CD ..\..
address@hidden Installing the package into local build environment ...
-
-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.
-
-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 ---------------------------------------------------------------------------
-REM Compile everything into an exe
-REM ---------------------------------------------------------------------------
-
-CD packaging\win32
-
address@hidden Building EXE-File ...
-PUSHD %GNUE_PATH%\Scripts
-
-C:\PYTHON25\PYTHON setup.py py2exe -c -d %GNUE_PATH%\Bin
-
-POPD
-
-REM Catch the built EXE and clean up the build environment
-IF EXIST %GNUE_PATH%\dist\*.exe (
- COPY %GNUE_PATH%\dist\*.exe .
- RMDIR /S /Q %GNUE_PATH%
- @ECHO Package completed
-)
-
-:EXIT
Modified: trunk/gnue-reports/packaging/win32/setup.py
===================================================================
--- trunk/gnue-reports/packaging/win32/setup.py 2009-12-12 14:29:05 UTC (rev
10126)
+++ trunk/gnue-reports/packaging/win32/setup.py 2009-12-14 16:03:19 UTC (rev
10127)
@@ -21,115 +21,19 @@
#
# $Id$
-import os
-import sys
import py2exe
-import win32api
-import win32con
from distutils.core import setup
-# -----------------------------------------------------------------------------
-# Constants used by this setup
-# -----------------------------------------------------------------------------
-# The path where we are creating the build environment for the setup compiler
-GNUE_PATH='C:\\GNUe'
-# The InnoSetup configuration file
-ISS_FILE = 'gnue-reports.iss'
-
-# The manifest will be inserted as resource into .exe files. This
-# gives the controls the Windows XP appearance (if run on XP).
-manifest = '''
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity
- version="5.0.0.0"
- processorArchitecture="x86"
- name="Controls"
- type="win32"
-/>
-<description>GNU Enterprise</description>
-<dependency>
- <dependentAssembly>
- <assemblyIdentity
- type="win32"
- name="Microsoft.Windows.Common-Controls"
- version="6.0.0.0"
- processorArchitecture="X86"
- publicKeyToken="6595b64144ccf1df"
- language="*"
- />
- </dependentAssembly>
-</dependency>
-</assembly>
-'''
-
-RT_MANIFEST = 24
-
-
-# -----------------------------------------------------------------------------
-# Run the setup to create all the exe files in the gnue-common package
-# -----------------------------------------------------------------------------
-def create_exe_files():
- """
- Create gnue-schema.exe (which is currently the only exe supplied by
- gnue-common.
- """
-
- setup( \
- console = [{"script": "gnue-reports",
- "other_resources": [(RT_MANIFEST, 1, manifest)]},
- {"script": "gnue-reports-server"}],
- options = {"py2exe":
- {"dll_excludes": ["msvcp60.dll",
- "tcl84.dll",
- "tk84.dll",
- "oci.dll"],
- "excludes": ["gnue.reports", "wx", "mx", "PIL"]
- }
- }
- )
-
-
-# -----------------------------------------------------------------------------
-# Examine the registry to find out where the InnoSetup compiler is located
-# -----------------------------------------------------------------------------
-
-def get_istool():
- root = win32con.HKEY_CLASSES_ROOT
- item = "InnoSetupScriptFile\\shell\\OpenWithISTool"
- try:
- path = None
- key = win32api.RegOpenKeyEx(root, item, 0, win32con.KEY_READ)
- value = win32api.RegQueryValue(key, "command")
- if isinstance(value, basestring):
- path = value.split(' ', 1)[0]
- except:
- pass
-
- return path
-
-
-# -----------------------------------------------------------------------------
-# Compile the setup
-# -----------------------------------------------------------------------------
-
-def compile_setup():
-
- istool = get_istool()
- if not istool:
- print "Cannot find ISTool.exe"
- sys.exit(1)
-
- cmd = '%s -compile %s' % (istool, ISS_FILE)
- os.system(cmd)
-
-
-# =============================================================================
-# Main program
-# =============================================================================
-
-create_exe_files()
-
-compile_setup()
+setup(
+ console = [
+ {'script': "gnue-reports"},
+ {"script": "gnue-reports-server"}],
+ options = {
+ "py2exe": {
+ "dll_excludes": [
+ "msvcp60.dll", "tcl84.dll", "tk84.dll", "oci.dll"],
+ "excludes": ["gnue.reports", "wx", "mx", "PIL"]
+ 'compressed': True,
+ 'bundle_files': 1}})
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r10127 - in trunk: gnue-common/packaging/win32 gnue-forms/packaging/win32 gnue-navigator/packaging/win32 gnue-reports/packaging/win32,
reinhard <=