small reorganization; no real change

[wxWidgets.git] / build / script / wxwidgets.iss

diff --git a/build/script/wxwidgets.iss b/build/script/wxwidgets.iss
index 7b1e8ca3ed1fa48bc6991e86723d31cedd0db008..b892aec1d6876a79c37b02e5d10a5fccb5743e50 100644 (file)
--- a/build/script/wxwidgets.iss
+++ b/build/script/wxwidgets.iss
@@ -2,8 +2,8 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #if GetEnv("WXW_VER") == "CVS"
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #if GetEnv("WXW_VER") == "CVS"

-    #define INFOFILE  "C:\wx\inno\wxWidgets\BuildCVS.txt"
-    #define WX_VERSION "CVS"
+    #define INFOFILE  "C:\wx\inno\wxWidgets\BuildSVN.txt"
+    #define WX_VERSION "SVN"

 #else
     #define INFOFILE "C:\wx\inno\wxWidgets\docs\msw\install.txt"
     #define WX_VERSION GetENV("WXW_VER")
 #else
     #define INFOFILE "C:\wx\inno\wxWidgets\docs\msw\install.txt"
     #define WX_VERSION GetENV("WXW_VER")


@@ -11,7 +11,7 @@
 
 #define SETUPFILENAME  "wxMSW-" + GetENV("WXW_VER") + "-Setup"
 
 
 #define SETUPFILENAME  "wxMSW-" + GetENV("WXW_VER") + "-Setup"
 

-
+#define INNODIR "C:\wx\inno\wxWidgets"

 
 [Setup]
 AppName=wxWidgets
 
 [Setup]
 AppName=wxWidgets


@@ -24,24 +24,24 @@ DefaultDirName={sd}\wxWidgets-{#WX_VERSION}
 DefaultGroupName=wxWidgets {#WX_VERSION}
 UsePreviousAppDir=no
 DisableProgramGroupPage=yes
 DefaultGroupName=wxWidgets {#WX_VERSION}
 UsePreviousAppDir=no
 DisableProgramGroupPage=yes

-LicenseFile=C:\wx\inno\wxWidgets\docs\licence.txt
-InfoBeforeFile=C:\wx\inno\wxWidgets\docs\readme.txt
+LicenseFile={#INNODIR}\docs\licence.txt
+InfoBeforeFile={#INNODIR}\docs\readme.txt

 InfoAfterFile={#INFOFILE}
 OutputDir=c:\daily
 OutputBaseFilename={#SETUPFILENAME}
 InfoAfterFile={#INFOFILE}
 OutputDir=c:\daily
 OutputBaseFilename={#SETUPFILENAME}

-SetupIconFile=C:\wx\inno\wxWidgets\art\wxwin.ico
+SetupIconFile={#INNODIR}\art\wxwin.ico

 Compression=lzma
 SolidCompression=yes
 
 [Files]
 ; source files
 Compression=lzma
 SolidCompression=yes
 
 [Files]
 ; source files

-Source: "C:\wx\inno\wxWidgets\*"; DestDir: "{app}"; Excludes: ".cvsignore,cocoa,dfb,mac,gtk,gtk1,mgl,motif,msdos,os2,palmos,wxWindows.xcod*,x11,contrib,debian,distrib,docs,misc,tests,wxPython,*.pch,*.pch++,*.pchmm"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#INNODIR}\*"; DestDir: "{app}"; Excludes: ".cvsignore,cocoa,dfb,mac,gtk,gtk1,mgl,motif,msdos,os2,palmos,wxWindows.xcod*,x11,contrib,debian,distrib,docs,misc,tests,wxPython,*.pch,*.pch++,*.pchmm"; Flags: ignoreversion recursesubdirs createallsubdirs

 ; docs and helpfile
 ; docs and helpfile

-Source: "C:\wx\inno\wxWidgets\docs\htmlhelp\*"; DestDir: "{app}\docs\htmlhelp\";  Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "C:\wx\inno\wxWidgets\docs\licence.txt"; DestDir: "{app}\docs\";  Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "C:\wx\inno\wxWidgets\docs\readme.txt"; DestDir: "{app}\docs\";  Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "C:\wx\inno\wxWidgets\docs\changes.txt"; DestDir: "{app}\docs\";  Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "C:\wx\inno\wxWidgets\docs\msw\install.txt"; DestDir: "{app}\docs\msw";  Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#INNODIR}\docs\htmlhelp\*"; DestDir: "{app}\docs\htmlhelp\";  Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#INNODIR}\docs\licence.txt"; DestDir: "{app}\docs\";  Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#INNODIR}\docs\readme.txt"; DestDir: "{app}\docs\";  Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#INNODIR}\docs\changes.txt"; DestDir: "{app}\docs\";  Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#INNODIR}\docs\msw\install.txt"; DestDir: "{app}\docs\msw";  Flags: ignoreversion recursesubdirs createallsubdirs

 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [INI]
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [INI]