Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2013-07-17 12:57:23 +00:00
parent 13626cf01a
commit beee5d6863
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
build/tools/wxwidgets.iss
View File

@@ -1,17 +1,23 @@
; Script generated by the Inno Setup Script Wizard. ; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define INNODIR GetENV("INNO") #if GetEnv("INNO") != ""
#define WXW_DIR GetEnv("INNO")
#if GetEnv("WXW_VER") == "SVN"
#define INFOFILE GetENV("INNO") + "\BuildSVN.txt"
#define WX_VERSION "SVN"
#else #else
#define INFOFILE GetENV("INNO") + "\docs\msw\install.txt" #define WXW_DIR "..\.."
#define WX_VERSION GetENV("WXW_VER")
#endif #endif
#define SETUPFILENAME "wxMSW-" + GetENV("WXW_VER") + "-Setup" #if GetEnv("WXW_VER") == "SVN"
#define INFOFILE WXW_DIR + "\BuildSVN.txt"
#define WX_VERSION "SVN"
#elif GetEnv("WXW_VER") != ""
#define INFOFILE WXW_DIR + "\docs\msw\install.txt"
#define WX_VERSION GetEnv("WXW_VER")
#else
#error "WXW_VER environment variable must be defined."
#endif
#define SETUPFILENAME "wxMSW-" + GetEnv("WXW_VER") + "-Setup"
@@ -26,25 +32,25 @@ DefaultDirName={sd}\wxWidgets-{#WX_VERSION}
DefaultGroupName=wxWidgets {#WX_VERSION} DefaultGroupName=wxWidgets {#WX_VERSION}
UsePreviousAppDir=no UsePreviousAppDir=no
DisableProgramGroupPage=yes DisableProgramGroupPage=yes
LicenseFile={#INNODIR}\docs\licence.txt LicenseFile={#WXW_DIR}\docs\licence.txt
InfoBeforeFile={#INNODIR}\docs\readme.txt InfoBeforeFile={#WXW_DIR}\docs\readme.txt
InfoAfterFile={#INFOFILE} InfoAfterFile={#INFOFILE}
OutputDir=c:\daily OutputDir=c:\daily
OutputBaseFilename={#SETUPFILENAME} OutputBaseFilename={#SETUPFILENAME}
PrivilegesRequired=none PrivilegesRequired=none
SetupIconFile={#INNODIR}\art\wxwin.ico SetupIconFile={#WXW_DIR}\art\wxwin.ico
Compression=lzma Compression=lzma
SolidCompression=yes SolidCompression=yes
[Files] [Files]
; source files ; source files
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 ; docs and helpfile
Source: "{#INNODIR}\docs\htmlhelp\*"; DestDir: "{app}\docs\htmlhelp\"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "{#WXW_DIR}\docs\htmlhelp\*"; DestDir: "{app}\docs\htmlhelp\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#INNODIR}\docs\licence.txt"; DestDir: "{app}\docs\"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "{#WXW_DIR}\docs\licence.txt"; DestDir: "{app}\docs\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#INNODIR}\docs\readme.txt"; DestDir: "{app}\docs\"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "{#WXW_DIR}\docs\readme.txt"; DestDir: "{app}\docs\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#INNODIR}\docs\changes.txt"; DestDir: "{app}\docs\"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "{#WXW_DIR}\docs\changes.txt"; DestDir: "{app}\docs\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#INNODIR}\docs\msw\install.txt"; DestDir: "{app}\docs\msw"; 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 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
[INI] [INI]
@@ -61,4 +67,3 @@ Name: "{group}\Uninstall wxWidgets {#WX_VERSION}"; Filename: "{uninstallexe}"
[UninstallDelete] [UninstallDelete]
Type: files; Name: "{app}\wx.url" Type: files; Name: "{app}\wx.url"