Use "INNO" env var in Inno Setup script only if it's defined.

Just use the sources directory itself if %INNO% is not defined. In fact, I
think we could always use the source directory, actually, but just in case
there was some reason to do it like this, keep using %INNO% if it is defined.

Also check that WXW_VER environment variable that we use is, in fact, defined.

FIX: Use relative path, not %WXWIN% in ISS script.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/tools/wxwidgets.iss b/build/tools/wxwidgets.iss
index b07fcd5784435de4903f3cab3d2f112af8fe7058..ad6cbe5d861afb193a68cb3de46e2c23ba695911 100644 (file)
--- a/build/tools/wxwidgets.iss
+++ b/build/tools/wxwidgets.iss
@@ -1,17 +1,23 @@
 ; Script generated by the Inno Setup Script Wizard.\r
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!\r
 \r
 ; Script generated by the Inno Setup Script Wizard.\r
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!\r
 \r

-#define INNODIR GetENV("INNO")\r
+#if GetEnv("INNO") != ""
+    #define WXW_DIR GetEnv("INNO")
+#else
+    #define WXW_DIR "..\.."
+#endif

 \r
 #if GetEnv("WXW_VER") == "SVN"\r
 \r
 #if GetEnv("WXW_VER") == "SVN"\r

-    #define INFOFILE  GetENV("INNO") + "\BuildSVN.txt"\r
+    #define INFOFILE  WXW_DIR + "\BuildSVN.txt"

     #define WX_VERSION "SVN"\r
     #define WX_VERSION "SVN"\r

+#elif GetEnv("WXW_VER") != ""
+    #define INFOFILE WXW_DIR + "\docs\msw\install.txt"
+    #define WX_VERSION GetEnv("WXW_VER")

 #else\r
 #else\r

-    #define INFOFILE GetENV("INNO") + "\docs\msw\install.txt"\r
-    #define WX_VERSION GetENV("WXW_VER")\r
+    #error "WXW_VER environment variable must be defined."

 #endif\r
 \r
 #endif\r
 \r

-#define SETUPFILENAME  "wxMSW-" + GetENV("WXW_VER") + "-Setup"\r
+#define SETUPFILENAME  "wxMSW-" + GetEnv("WXW_VER") + "-Setup"

 \r
 \r
 \r
 \r
 \r
 \r


@@ -26,25 +32,25 @@ DefaultDirName={sd}\wxWidgets-{#WX_VERSION}
 DefaultGroupName=wxWidgets {#WX_VERSION}\r
 UsePreviousAppDir=no\r
 DisableProgramGroupPage=yes\r
 DefaultGroupName=wxWidgets {#WX_VERSION}\r
 UsePreviousAppDir=no\r
 DisableProgramGroupPage=yes\r

-LicenseFile={#INNODIR}\docs\licence.txt\r
-InfoBeforeFile={#INNODIR}\docs\readme.txt\r
+LicenseFile={#WXW_DIR}\docs\licence.txt
+InfoBeforeFile={#WXW_DIR}\docs\readme.txt

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

-SetupIconFile={#INNODIR}\art\wxwin.ico\r
+SetupIconFile={#WXW_DIR}\art\wxwin.ico

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

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

 ; docs and helpfile\r
 ; docs and helpfile\r

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

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


@@ -61,4 +67,3 @@ Name: "{group}\Uninstall wxWidgets {#WX_VERSION}"; Filename: "{uninstallexe}"
 \r
 [UninstallDelete]\r
 Type: files; Name: "{app}\wx.url"\r
 \r
 [UninstallDelete]\r
 Type: files; Name: "{app}\wx.url"\r

-\r