r5890 - trunk/gnue-common/packaging/win32

[btami]

Author: btami
Date: 2004-06-11 16:27:37 -0500 (Fri, 11 Jun 2004)
New Revision: 5890

Removed:
   trunk/gnue-common/packaging/win32/gnue-tools.iss
Modified:
   trunk/gnue-common/packaging/win32/GNUe-Appserver-debug.iss
   trunk/gnue-common/packaging/win32/GNUe-Appserver.iss
   trunk/gnue-common/packaging/win32/GNUe-Common-debug.iss
   trunk/gnue-common/packaging/win32/GNUe-Common.iss
   trunk/gnue-common/packaging/win32/GNUe-Designer-debug.iss
   trunk/gnue-common/packaging/win32/GNUe-Designer.iss
   trunk/gnue-common/packaging/win32/GNUe-Forms-debug.iss
   trunk/gnue-common/packaging/win32/GNUe-Forms.iss
   trunk/gnue-common/packaging/win32/GNUe-Navigator-debug.iss
   trunk/gnue-common/packaging/win32/GNUe-Navigator.iss
   trunk/gnue-common/packaging/win32/GNUe-Reports-debug.iss
   trunk/gnue-common/packaging/win32/GNUe-Reports.iss
   trunk/gnue-common/packaging/win32/GNUe-Runtime-Environment.iss
   trunk/gnue-common/packaging/win32/README
   trunk/gnue-common/packaging/win32/setup.cmd
   trunk/gnue-common/packaging/win32/setup.py
Log:
* enhanced .iss files to produce different install/remove entryes for different 
tools
* removed '-debug' tail from console version .exe filenames

Modified: trunk/gnue-common/packaging/win32/GNUe-Appserver-debug.iss
===================================================================
--- trunk/gnue-common/packaging/win32/GNUe-Appserver-debug.iss  2004-06-11 
21:03:49 UTC (rev 5889)
+++ trunk/gnue-common/packaging/win32/GNUe-Appserver-debug.iss  2004-06-11 
21:27:37 UTC (rev 5890)
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 [Setup]
-AppId=GNUe-Tools
+AppId=GNUe-Appserver-debug
 AppName=GNUe-Appserver-debug
 AppVerName=GNUe-Appserver-0.0.7.99-pre1-debug
 AppPublisher=GNU Enterprise
@@ -18,8 +18,6 @@
 ShowLanguageDialog=yes
 OutputBaseFilename=GNUe-Appserver-0.0.7.99-pre1-debug
 DisableDirPage=true
-UninstallLogMode=new
-UninstallDisplayName=GNUe-Appserver-debug
 
 [Tasks]
 Name: desktopicon; Description: Create a &desktop icon; GroupDescription: 
Additional icons:; MinVersion: 4,4
@@ -30,8 +28,8 @@
 Name: translations; Description: Translations; Types: full
 
 [Files]
-Source: c:\gnue\bin\gnue-appserver-debug.exe; DestDir: {app}\bin; Components: 
main; Flags: ignoreversion
-Source: c:\gnue\bin\gnue-gsdgen-debug.exe; DestDir: {app}\bin; Components: 
main; Flags: ignoreversion
+Source: c:\gnue\bin\gnue-appserver.exe; DestDir: {app}\bin; Components: main; 
Flags: ignoreversion
+Source: c:\gnue\bin\gnue-gsdgen.exe; DestDir: {app}\bin; Components: main; 
Flags: ignoreversion
 Source: c:\gnue\bin\gnue-gcd2sql.exe; DestDir: {app}\bin; Components: main; 
Flags: ignoreversion
 Source: c:\gnue\bin\gnue\appserver\*.*; DestDir: {app}\bin\gnue\appserver; 
Flags: recursesubdirs ignoreversion; Components: main
 Source: c:\gnue\share\locale\de\LC_MESSAGES\gnue-appserver.mo; DestDir: 
{app}\share\locale\de\LC_MESSAGES\; Flags: recursesubdirs; Components: 
translations
@@ -47,8 +45,8 @@
 Source: c:\gnue\share\gnue\grpc\appserver.grpc; DestDir: 
{app}\share\gnue\grpc; Components: main
 
 [Icons]
-Name: {group}\GNUe Appserver; Filename: {app}\bin\gnue-appserver-debug.exe
-Name: {userdesktop}\GNUe Appserver; Filename: 
{app}\bin\gnue-appserver-debug.exe; WorkingDir: {app}; MinVersion: 4,4; Tasks: 
desktopicon
+Name: {group}\GNUe Appserver; Filename: {app}\bin\gnue-appserver.exe
+Name: {userdesktop}\GNUe Appserver; Filename: {app}\bin\gnue-appserver.exe; 
WorkingDir: {app}; MinVersion: 4,4; Tasks: desktopicon
 
 [UninstallDelete]
 Name: {app}\bin\gnue\appserver\*.*; Type: filesandordirs

Modified: trunk/gnue-common/packaging/win32/GNUe-Appserver.iss
===================================================================
--- trunk/gnue-common/packaging/win32/GNUe-Appserver.iss        2004-06-11 
21:03:49 UTC (rev 5889)
+++ trunk/gnue-common/packaging/win32/GNUe-Appserver.iss        2004-06-11 
21:27:37 UTC (rev 5890)
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 [Setup]
-AppId=GNUe-Tools
+AppId=GNUe-Appserver
 AppName=GNUe-Appserver
 AppVerName=GNUe-Appserver-0.0.7.99-pre1
 AppPublisher=GNU Enterprise
@@ -18,8 +18,6 @@
 ShowLanguageDialog=yes
 OutputBaseFilename=GNUe-Appserver-0.0.7.99-pre1
 DisableDirPage=true
-UninstallLogMode=new
-UninstallDisplayName=GNUe-Appserver
 
 [Tasks]
 Name: desktopicon; Description: Create a &desktop icon; GroupDescription: 
Additional icons:; MinVersion: 4,4

Modified: trunk/gnue-common/packaging/win32/GNUe-Common-debug.iss
===================================================================
--- trunk/gnue-common/packaging/win32/GNUe-Common-debug.iss     2004-06-11 
21:03:49 UTC (rev 5889)
+++ trunk/gnue-common/packaging/win32/GNUe-Common-debug.iss     2004-06-11 
21:27:37 UTC (rev 5890)
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 [Setup]
-AppId=GNUe-Tools
+AppId=GNUe-Common-debug
 AppName=GNUe-Common-debug
 AppVerName=GNUe-Common-0.5.4.99-pre1-debug
 AppPublisher=GNU Enterprise
@@ -18,8 +18,6 @@
 ShowLanguageDialog=yes
 OutputBaseFilename=GNUe-Common-0.5.4.99-pre1-debug
 DisableDirPage=true
-UninstallLogMode=new
-UninstallDisplayName=GNUe-Common-debug
 
 [Tasks]
 Name: desktopicon; Description: Create a &desktop icon; GroupDescription: 
Additional icons:; MinVersion: 4,4
@@ -30,8 +28,8 @@
 Name: translations; Description: Translations; Types: full
 
 [Files]
-Source: c:\gnue\bin\gnue-import-debug.exe; DestDir: {app}\bin; Components: 
main; Flags: ignoreversion
-Source: c:\gnue\bin\gnue-schema-debug.exe; DestDir: {app}\bin; Components: 
main; Flags: ignoreversion
+Source: c:\gnue\bin\gnue-import.exe; DestDir: {app}\bin; Components: main; 
Flags: ignoreversion
+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\sample.gnue.conf; DestDir: {app}\etc; Components: main; 
Flags: ignoreversion

Modified: trunk/gnue-common/packaging/win32/GNUe-Common.iss
===================================================================
--- trunk/gnue-common/packaging/win32/GNUe-Common.iss   2004-06-11 21:03:49 UTC 
(rev 5889)
+++ trunk/gnue-common/packaging/win32/GNUe-Common.iss   2004-06-11 21:27:37 UTC 
(rev 5890)
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 [Setup]
-AppId=GNUe-Tools
+AppId=GNUe-Common
 AppName=GNUe-Common
 AppVerName=GNUe-Common-0.5.4.99-pre1
 AppPublisher=GNU Enterprise
@@ -18,8 +18,6 @@
 ShowLanguageDialog=yes
 OutputBaseFilename=GNUe-Common-0.5.4.99-pre1
 DisableDirPage=true
-UninstallLogMode=new
-UninstallDisplayName=GNUe-Common
 
 [Tasks]
 Name: desktopicon; Description: Create a &desktop icon; GroupDescription: 
Additional icons:; MinVersion: 4,4

Modified: trunk/gnue-common/packaging/win32/GNUe-Designer-debug.iss
===================================================================
--- trunk/gnue-common/packaging/win32/GNUe-Designer-debug.iss   2004-06-11 
21:03:49 UTC (rev 5889)
+++ trunk/gnue-common/packaging/win32/GNUe-Designer-debug.iss   2004-06-11 
21:27:37 UTC (rev 5890)
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 [Setup]
-AppId=GNUe-Tools
+AppId=GNUe-Designer-debug
 AppName=GNUe-Designer-debug
 AppVerName=GNUe-Designer-0.5.4-debug
 AppPublisher=GNU Enterprise
@@ -18,8 +18,6 @@
 ShowLanguageDialog=yes
 OutputBaseFilename=GNUe-Designer-0.5.4-debug
 DisableDirPage=true
-UninstallLogMode=new
-UninstallDisplayName=GNUe-Designer-debug
 
 [Tasks]
 Name: desktopicon; Description: Create a &desktop icon; GroupDescription: 
Additional icons:; MinVersion: 4,4
@@ -30,7 +28,7 @@
 Name: translations; Description: Translations; Types: full
 
 [Files]
-Source: c:\gnue\bin\gnue-designer-debug.exe; DestDir: {app}\bin; Components: 
main; Flags: ignoreversion
+Source: c:\gnue\bin\gnue-designer.exe; DestDir: {app}\bin; Components: main; 
Flags: ignoreversion
 Source: c:\gnue\bin\gnue\designer\*.*; DestDir: {app}\bin\gnue\designer; 
Flags: recursesubdirs ignoreversion; Components: main
 Source: c:\gnue\share\locale\de\LC_MESSAGES\gnue-designer.mo; DestDir: 
{app}\share\locale\de\LC_MESSAGES\; Flags: recursesubdirs; Components: 
translations
 Source: c:\gnue\share\locale\es_MX\LC_MESSAGES\gnue-designer.mo; DestDir: 
{app}\share\locale\es_MX\LC_MESSAGES\; Flags: recursesubdirs; Components: 
translations
@@ -45,8 +43,8 @@
 
 [Icons]
 Name: {group}\Documentation\Designer Users Guide (PDF Format); Filename: 
{app}\share\doc\gnue-designer\Users-Guide.pdf; Components: doc
-Name: {group}\GNUe Designer; Filename: {app}\bin\gnue-designer-debug.exe
-Name: {userdesktop}\GNUe Designer; Filename: 
{app}\bin\gnue-designer-debug.exe; WorkingDir: {app}; MinVersion: 4,4; Tasks: 
desktopicon
+Name: {group}\GNUe Designer; Filename: {app}\bin\gnue-designer.exe
+Name: {userdesktop}\GNUe Designer; Filename: {app}\bin\gnue-designer.exe; 
WorkingDir: {app}; MinVersion: 4,4; Tasks: desktopicon
 
 [UninstallDelete]
 Name: {app}\bin\gnue\designer\*.*; Type: filesandordirs

Modified: trunk/gnue-common/packaging/win32/GNUe-Designer.iss
===================================================================
--- trunk/gnue-common/packaging/win32/GNUe-Designer.iss 2004-06-11 21:03:49 UTC 
(rev 5889)
+++ trunk/gnue-common/packaging/win32/GNUe-Designer.iss 2004-06-11 21:27:37 UTC 
(rev 5890)
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 [Setup]
-AppId=GNUe-Tools
+AppId=GNUe-Designer
 AppName=GNUe-Designer
 AppVerName=GNUe-Designer-0.5.4
 AppPublisher=GNU Enterprise
@@ -18,8 +18,6 @@
 ShowLanguageDialog=yes
 OutputBaseFilename=GNUe-Designer-0.5.4
 DisableDirPage=true
-UninstallLogMode=new
-UninstallDisplayName=GNUe-Designer
 
 [Tasks]
 Name: desktopicon; Description: Create a &desktop icon; GroupDescription: 
Additional icons:; MinVersion: 4,4

Modified: trunk/gnue-common/packaging/win32/GNUe-Forms-debug.iss
===================================================================
--- trunk/gnue-common/packaging/win32/GNUe-Forms-debug.iss      2004-06-11 
21:03:49 UTC (rev 5889)
+++ trunk/gnue-common/packaging/win32/GNUe-Forms-debug.iss      2004-06-11 
21:27:37 UTC (rev 5890)
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 [Setup]
-AppId=GNUe-Tools
+AppId=GNUe-Forms-debug
 AppName=GNUe-Forms-debug
 AppVerName=GNUe-Forms-0.5.4.99-pre1-debug
 AppPublisher=GNU Enterprise
@@ -19,8 +19,6 @@
 OutputBaseFilename=GNUe-Forms-0.5.4.99-pre1-debug
 DisableDirPage=true
 AppendDefaultDirName=false
-UninstallLogMode=new
-UninstallDisplayName=GNUe-Forms-debug
 
 [Tasks]
 Name: desktopicon; Description: Create a &desktop icon; GroupDescription: 
Additional icons:; MinVersion: 4,4
@@ -31,7 +29,7 @@
 Name: translations; Description: Translations; Types: full
 
 [Files]
-Source: c:\gnue\bin\gnue-forms-debug.exe; DestDir: {app}\bin; Components: 
main; Flags: ignoreversion
+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\de\LC_MESSAGES\gnue-forms.mo; DestDir: 
{app}\share\locale\de\LC_MESSAGES\; Flags: recursesubdirs; Components: 
translations
 Source: c:\gnue\share\locale\es_MX\LC_MESSAGES\gnue-forms.mo; DestDir: 
{app}\share\locale\es_MX\LC_MESSAGES\; Flags: recursesubdirs; Components: 
translations
@@ -56,8 +54,8 @@
 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-debug.EXE,0
-Root: HKCR; Subkey: GNUeFormsClient\shell\open\command; ValueType: string; 
ValueName: ; ValueData: """{app}\bin\GNUE-FORMS-debug.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

Modified: trunk/gnue-common/packaging/win32/GNUe-Forms.iss
===================================================================
--- trunk/gnue-common/packaging/win32/GNUe-Forms.iss    2004-06-11 21:03:49 UTC 
(rev 5889)
+++ trunk/gnue-common/packaging/win32/GNUe-Forms.iss    2004-06-11 21:27:37 UTC 
(rev 5890)
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 [Setup]
-AppId=GNUe-Tools
+AppId=GNUe-Forms
 AppName=GNUe-Forms
 AppVerName=GNUe-Forms-0.5.4.99-pre1
 AppPublisher=GNU Enterprise
@@ -19,8 +19,6 @@
 OutputBaseFilename=GNUe-Forms-0.5.4.99-pre1
 DisableDirPage=true
 AppendDefaultDirName=false
-UninstallLogMode=new
-UninstallDisplayName=GNUe-Forms
 
 [Tasks]
 Name: desktopicon; Description: Create a &desktop icon; GroupDescription: 
Additional icons:; MinVersion: 4,4

Modified: trunk/gnue-common/packaging/win32/GNUe-Navigator-debug.iss
===================================================================
--- trunk/gnue-common/packaging/win32/GNUe-Navigator-debug.iss  2004-06-11 
21:03:49 UTC (rev 5889)
+++ trunk/gnue-common/packaging/win32/GNUe-Navigator-debug.iss  2004-06-11 
21:27:37 UTC (rev 5890)
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 [Setup]
-AppId=GNUe-Tools
+AppId=GNUe-Navigator-debug
 AppName=GNUe-Navigator-debug
 AppVerName=GNUe-Navigator-0.0.7-debug
 AppPublisher=GNU Enterprise
@@ -18,8 +18,6 @@
 ShowLanguageDialog=yes
 OutputBaseFilename=GNUe-Navigator-0.0.7-debug
 DisableDirPage=true
-UninstallLogMode=new
-UninstallDisplayName=GNUe-Navigator-debug
 
 [Tasks]
 Name: desktopicon; Description: Create a &desktop icon; GroupDescription: 
Additional icons:; MinVersion: 4,4
@@ -30,7 +28,7 @@
 Name: translations; Description: Translations; Types: full
 
 [Files]
-Source: c:\gnue\bin\gnue-navigator-debug.exe; DestDir: {app}\bin; Components: 
main; Flags: ignoreversion
+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\de\LC_MESSAGES\gnue-navigator.mo; DestDir: 
{app}\share\locale\de\LC_MESSAGES\; Flags: recursesubdirs; Components: 
translations
 Source: c:\gnue\share\locale\es_MX\LC_MESSAGES\gnue-navigator.mo; DestDir: 
{app}\share\locale\es_MX\LC_MESSAGES\; Flags: recursesubdirs; Components: 
translations
@@ -51,8 +49,8 @@
 Root: HKCR; Subkey: .gpd; ValueType: string; ValueName: ; ValueData: 
GNUeNavigatorClient; Flags: uninsdeletekey deletekey
 Root: HKCR; Subkey: GNUeNavigatorClient; ValueType: string; ValueName: ; 
ValueData: GNUe Navigator Definition; Flags: uninsdeletekey deletekey
 ;when we get a nifty icon, that's set here :)
-Root: HKCR; Subkey: GNUeNavigatorClient\DefaultIcon; ValueType: string; 
ValueName: ; ValueData: {app}\bin\GNUE-NAVIGATOR-debug.EXE,0
-Root: HKCR; Subkey: GNUeNavigatorClient\shell\open\command; ValueType: string; 
ValueName: ; ValueData: """{app}\bin\GNUE-NAVIGATOR-debug.EXE"" ""%1"""; Flags: 
deletekey
+Root: HKCR; Subkey: GNUeNavigatorClient\DefaultIcon; ValueType: string; 
ValueName: ; ValueData: {app}\bin\GNUE-NAVIGATOR.EXE,0
+Root: HKCR; Subkey: GNUeNavigatorClient\shell\open\command; ValueType: string; 
ValueName: ; ValueData: """{app}\bin\GNUE-NAVIGATOR.EXE"" ""%1"""; Flags: 
deletekey
 
 [UninstallDelete]
 Name: {app}\bin\gnue\navigator\*.*; Type: filesandordirs

Modified: trunk/gnue-common/packaging/win32/GNUe-Navigator.iss
===================================================================
--- trunk/gnue-common/packaging/win32/GNUe-Navigator.iss        2004-06-11 
21:03:49 UTC (rev 5889)
+++ trunk/gnue-common/packaging/win32/GNUe-Navigator.iss        2004-06-11 
21:27:37 UTC (rev 5890)
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 [Setup]
-AppId=GNUe-Tools
+AppId=GNUe-Navigator
 AppName=GNUe-Navigator
 AppVerName=GNUe-Navigator-0.0.7
 AppPublisher=GNU Enterprise
@@ -18,8 +18,6 @@
 ShowLanguageDialog=yes
 OutputBaseFilename=GNUe-Navigator-0.0.7
 DisableDirPage=true
-UninstallLogMode=new
-UninstallDisplayName=GNUe-Navigator
 
 [Tasks]
 Name: desktopicon; Description: Create a &desktop icon; GroupDescription: 
Additional icons:; MinVersion: 4,4

Modified: trunk/gnue-common/packaging/win32/GNUe-Reports-debug.iss
===================================================================
--- trunk/gnue-common/packaging/win32/GNUe-Reports-debug.iss    2004-06-11 
21:03:49 UTC (rev 5889)
+++ trunk/gnue-common/packaging/win32/GNUe-Reports-debug.iss    2004-06-11 
21:27:37 UTC (rev 5890)
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 [Setup]
-AppId=GNUe-Tools
+AppId=GNUe-Reports-debug
 AppName=GNUe-Reports-debug
 AppVerName=GNUe-Reports-0.1.5-debug
 AppPublisher=GNU Enterprise
@@ -18,8 +18,6 @@
 ShowLanguageDialog=yes
 OutputBaseFilename=GNUe-Reports-0.1.5-debug
 DisableDirPage=true
-UninstallLogMode=new
-UninstallDisplayName=GNUe-Reports-debug
 
 [Tasks]
 Name: desktopicon; Description: Create a &desktop icon; GroupDescription: 
Additional icons:; MinVersion: 4,4
@@ -30,8 +28,8 @@
 Name: translations; Description: Translations; Types: full
 
 [Files]
-Source: c:\gnue\bin\gnue-reports-debug.exe; DestDir: {app}\bin; Components: 
main; Flags: ignoreversion
-Source: c:\gnue\bin\gnue-reports-server-debug.exe; DestDir: {app}\bin; 
Components: main; Flags: ignoreversion
+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\etc\sample.report-filters.conf; DestDir: {app}\etc; 
Components: main; Flags: ignoreversion
 Source: C:\gnue\etc\report-filters.conf; DestDir: {app}\etc; Components: main; 
Flags: onlyifdoesntexist

Modified: trunk/gnue-common/packaging/win32/GNUe-Reports.iss
===================================================================
--- trunk/gnue-common/packaging/win32/GNUe-Reports.iss  2004-06-11 21:03:49 UTC 
(rev 5889)
+++ trunk/gnue-common/packaging/win32/GNUe-Reports.iss  2004-06-11 21:27:37 UTC 
(rev 5890)
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 [Setup]
-AppId=GNUe-Tools
+AppId=GNUe-Reports
 AppName=GNUe-Reports
 AppVerName=GNUe-Reports-0.1.5
 AppPublisher=GNU Enterprise
@@ -18,8 +18,6 @@
 ShowLanguageDialog=yes
 OutputBaseFilename=GNUe-Reports-0.1.5
 DisableDirPage=true
-UninstallLogMode=new
-UninstallDisplayName=GNUe-Reports
 
 [Tasks]
 Name: desktopicon; Description: Create a &desktop icon; GroupDescription: 
Additional icons:; MinVersion: 4,4

Modified: trunk/gnue-common/packaging/win32/GNUe-Runtime-Environment.iss
===================================================================
--- trunk/gnue-common/packaging/win32/GNUe-Runtime-Environment.iss      
2004-06-11 21:03:49 UTC (rev 5889)
+++ trunk/gnue-common/packaging/win32/GNUe-Runtime-Environment.iss      
2004-06-11 21:27:37 UTC (rev 5890)
@@ -15,7 +15,6 @@
 OutputBaseFilename=GNUe-Runtime-Environment-2004.04.10
 VersionInfoVersion=2004.04.10
 ShowLanguageDialog=yes
-UninstallDisplayName=GNUe-Runtime-Environment
 
 [Files]
 Source: c:\gnue\bin\*.dll; DestDir: {app}\bin; Flags: ignoreversion

Modified: trunk/gnue-common/packaging/win32/README
===================================================================
--- trunk/gnue-common/packaging/win32/README    2004-06-11 21:03:49 UTC (rev 
5889)
+++ trunk/gnue-common/packaging/win32/README    2004-06-11 21:27:37 UTC (rev 
5890)
@@ -11,7 +11,7 @@
 
 Put setup.py setup.cmd *.iss into c:\python23\scripts directory.
 
-Run setup.cmd
+Run setup.cmd (or "setup.cmd -k" for building console apps)
 
 Convert OOo doc files to pdf, and put them into c:\gnue\share\doc\gnue-*
 

Deleted: trunk/gnue-common/packaging/win32/gnue-tools.iss
===================================================================
--- trunk/gnue-common/packaging/win32/gnue-tools.iss    2004-06-11 21:03:49 UTC 
(rev 5889)
+++ trunk/gnue-common/packaging/win32/gnue-tools.iss    2004-06-11 21:27:37 UTC 
(rev 5890)
@@ -1,79 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-[Setup]
-AppName=GNUe-Tools
-AppVerName=GNUe-Tools 0.5.3.99 svn-5657
-AppPublisher=GNU Enterprise
-AppPublisherURL=http://www.gnuenterprise.org
-AppSupportURL=http://www.gnuenterprise.org
-AppUpdatesURL=http://www.gnuenterprise.org
-DefaultDirName={pf}\GNUe\
-DefaultGroupName=GNUe
-AllowNoIcons=yes
-;AlwaysCreateUninstallIcon=yes
-LicenseFile=c:\gnue\LICENSE.txt
-ChangesAssociations=yes
-; uncomment the following line if you want your installation to run on NT 3.51 
too.
-; MinVersion=4,3.51
-
-[Tasks]
-Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: 
"Additional icons:"; MinVersion: 4,4
-
-[Components]
-Name: "main"; Description: "Shared Program Files"; Types: full compact custom; 
Flags: fixed
-Name: "forms"; Description: "GNUe Forms Client"; Types: full
-Name: "navigator"; Description: "GNUe Navigator Client"; Types: full
-Name: "reports"; Description: "GNUe Reports Client"; Types: full
-Name: "designer"; Description: "GNUe Designer"; Types: full
-Name: "appserver"; Description: "GNUe Appserver"; Types: full
-Name: "doc"; Description: "Documentation"; Types: full
-Name: "sampleconfig"; Description: "Sample Configuration Files"; Types: full
-Name: "translations"; Description: "Translations"; Types: full
-
-[Files]
-Source: "c:\gnue\bin\gnue-import.exe"; DestDir: "{app}\bin"; CopyMode: 
alwaysoverwrite; Components: main
-Source: "c:\gnue\bin\gnue-schema.exe"; DestDir: "{app}\bin"; CopyMode: 
alwaysoverwrite; Components: main
-Source: "c:\gnue\bin\gnue-forms.exe"; DestDir: "{app}\bin"; CopyMode: 
alwaysoverwrite; Components: forms
-Source: "c:\gnue\bin\gnue-reports.exe"; DestDir: "{app}\bin"; CopyMode: 
alwaysoverwrite; Components: reports
-Source: "c:\gnue\bin\gnue-reports-server.exe"; DestDir: "{app}\bin"; CopyMode: 
alwaysoverwrite; Components: reports
-Source: "c:\gnue\bin\gnue-navigator.exe"; DestDir: "{app}\bin"; CopyMode: 
alwaysoverwrite; Components: navigator
-Source: "c:\gnue\bin\gnue-designer.exe"; DestDir: "{app}\bin"; CopyMode: 
alwaysoverwrite; Components: designer
-Source: "c:\gnue\bin\gnue-appserver.exe"; DestDir: "{app}\bin"; CopyMode: 
alwaysoverwrite; Components: appserver
-Source: "c:\gnue\bin\gnue-gsdgen.exe"; DestDir: "{app}\bin"; CopyMode: 
alwaysoverwrite; Components: appserver
-Source: "c:\gnue\bin\*.*"; DestDir: "{app}\bin"; Flags: recursesubdirs; 
CopyMode: alwaysoverwrite; Components: main
-Source: "c:\gnue\LICENSE.txt"; DestDir: "{app}"; CopyMode: alwaysoverwrite; 
Components: main
-Source: "C:\gnue\etc\s*.*"; DestDir: "{app}\etc"; CopyMode: alwaysoverwrite; 
Components: sampleconfig
-Source: "C:\gnue\etc\gnue.conf"; DestDir: "{app}\etc"; CopyMode: 
onlyifdoesntexist; Components: main
-Source: "C:\gnue\etc\connections.conf"; DestDir: "{app}\etc"; CopyMode: 
onlyifdoesntexist; Components: main
-Source: "C:\gnue\etc\report-filters.conf"; DestDir: "{app}\etc"; CopyMode: 
onlyifdoesntexist; Components: reports
-Source: "C:\gnue\share\gnue\*.*"; DestDir: "{app}\share\gnue\"; Flags: 
recursesubdirs; Components: main
-Source: "c:\gnue\share\locale\*.*"; DestDir: "{app}\share\locale\"; Flags: 
recursesubdirs; Components: translations
-Source: "c:\gnue\share\doc\*.*"; DestDir: "{app}\share\doc"; Flags: 
recursesubdirs; Components: doc
-
-[INI]
-Filename: "{app}\gnue.url"; Section: "InternetShortcut"; Key: "URL"; String: 
"http://www.gnuenterprise.org";
-
-[Icons]
-Name: "{group}\Documentation\Common Developers Guide (PDF Format)"; Filename: 
"{app}\share\doc\gnue-common\Developers-Guide.pdf"; Components: doc
-Name: "{group}\Documentation\Forms Developers Guide (PDF Format)"; Filename: 
"{app}\share\doc\gnue-forms\Developers-Guide.pdf"; Components: doc
-Name: "{group}\Documentation\Designer Users Guide (PDF Format)"; Filename: 
"{app}\share\doc\gnue-designer\Users-Guide.pdf"; Components: doc
-Name: "{group}\Documentation\Reports Concepts Guide (PDF Format)"; Filename: 
"{app}\share\doc\gnue-reports\Concepts-Guide.pdf"; Components: doc
-Name: "{group}\GNUe Designer"; Filename: "{app}\bin\gnue-designer.exe"
-Name: "{group}\GNUe Forms Client"; Filename: 
"{app}\share\doc\gnue-forms\examples\intro\intro.gfd"
-Name: "{group}\GNUe Connections"; Filename: 
"{app}\share\doc\gnue-forms\examples\connections\connection.gfd"
-Name: "{group}\GNUe on the Web"; Filename: "{app}\gnue.url"
-Name: "{userdesktop}\GNUe Forms Client"; Filename: 
"{app}\share\doc\gnue-forms\examples\intro\intro.gfd"; WorkingDir: "{app}"; 
MinVersion: 4,4; Tasks: desktopicon
-Name: "{userdesktop}\GNUe Designer"; Filename: "{app}\bin\gnue-designer.exe"; 
WorkingDir: "{app}"; MinVersion: 4,4; Tasks: desktopicon
-
-[UninstallDelete]
-Type: files; Name: "{app}\gnue.url"
-
-[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
-

Modified: trunk/gnue-common/packaging/win32/setup.cmd
===================================================================
--- trunk/gnue-common/packaging/win32/setup.cmd 2004-06-11 21:03:49 UTC (rev 
5889)
+++ trunk/gnue-common/packaging/win32/setup.cmd 2004-06-11 21:27:37 UTC (rev 
5890)
@@ -1,17 +1,12 @@
 set PythonPath=c:\python23
 set GnuePath=c:\gnue
 
+rem goto compile
+
 del /s /q %GnuePath%\bin
 del /s /q %GnuePath%\etc
 del /s /q %GnuePath%\share
 
-
-for %%x in (appserver gsdgen gcd2sql designer reports reports-server navigator 
forms import schema) do copy gnue-%%x gnue-%%x-debug
-python setup.py py2exe -c
-del gnue*-debug
-
-xcopy dist %GnuePath%\bin\ /Y
-
 xcopy %PythonPath%\lib\site-packages\gnue\*.py %GnuePath%\bin\gnue\ /Y /E
 
 xcopy %PythonPath%\etc\sample.*.conf %GnuePath%\etc\ /Y
@@ -27,3 +22,10 @@
 copy %GnuePath%\etc\sample.gnue.conf %GnuePath%\etc\gnue.conf
 copy %GnuePath%\etc\sample.connections.conf %GnuePath%\etc\connections.conf
 copy %GnuePath%\etc\sample.report-filters.conf 
%GnuePath%\etc\report-filters.conf
+
+
+:compile
+
+python setup.py py2exe -c %1
+
+xcopy dist %GnuePath%\bin\ /Y

Modified: trunk/gnue-common/packaging/win32/setup.py
===================================================================
--- trunk/gnue-common/packaging/win32/setup.py  2004-06-11 21:03:49 UTC (rev 
5889)
+++ trunk/gnue-common/packaging/win32/setup.py  2004-06-11 21:27:37 UTC (rev 
5890)
@@ -1,4 +1,6 @@
 # Usage: python setup.py py2exe -c
+# or python setup.py py2exe -c -k
+# for console apps.
 
 # py2exe-0.5.0 needs a patch to process our typelibs
 # in build_exe.py (line 1056)
@@ -6,6 +8,7 @@
 
 from distutils.core import setup
 import py2exe 
+import sys
 
 scripts = ["gnue-appserver",
            "gnue-designer",
@@ -18,9 +21,20 @@
            "gnue-reports-server",
            "gnue-schema"]
 
+console = []
+windows = scripts
+
+# If run with arg "-k", build console apps.
+if len(sys.argv) == 4:
+  if sys.argv[3] == "-k":
+    print 'Building console apps.'
+    console = scripts
+    windows = []
+  del sys.argv[3]
+
 setup ( \
-console = ["%s-debug" % script for script in scripts],
-windows = scripts,
+console = console,
+windows = windows,
 options = {"py2exe": {"typelibs": 
[('{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}',0,1,1)],
                                   #'Microsoft Internet Controls'
                       "packages": ["encodings",