Added setters for table row and column count

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

diff --git a/build/tools/wxwidgets.iss b/build/tools/wxwidgets.iss
index b2aded70d75bd6224b5dfd3ce16e0dba4afcd6da..0b180d6223988c63f2c5f9f61e692823cfdb88a9 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,32 +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
-InfoAfterFile={#INFOFILE}\r
-OutputDir=c:\daily\r
-OutputBaseFilename={#SETUPFILENAME}\r
+LicenseFile={#WXW_DIR}\docs\licence.txt
+InfoBeforeFile={#WXW_DIR}\docs\readme.txt
+InfoAfterFile={#INFOFILE}
+OutputDir={#WXW_DIR}\..
+OutputBaseFilename={#SETUPFILENAME}

 PrivilegesRequired=none
 PrivilegesRequired=none

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

 Compression=lzma\r
 SolidCompression=yes\r
 Compression=lzma\r
 SolidCompression=yes\r

-\r
-[Files]\r
-; source files\r
-Source: "{#INNODIR}\*"; DestDir: "{app}"; Excludes: ".cvsignore,cocoa,dfb,mac,gtk,gtk1,mgl,motif,msdos,os2,palmos,wxWindows.xcod*,x11,debian,distrib,docs,misc,tests,wxPython,*.pch,*.pch++,*.pchmm"; Flags: ignoreversion recursesubdirs createallsubdirs\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
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files\r
-\r
-[INI]\r
-Filename: "{app}\wx.url"; Section: "InternetShortcut"; Key: "URL"; String: "http://www.wxwidgets.org"\r
+
+[Files]
+; source files
+Source: "{#WXW_DIR}\*"; DestDir: "{app}"; Excludes: "cocoa,dfb,gtk,gtk1,motif,msdos,os2,osx,wxWindows.xcod*,x11,debian,distrib"; Flags: ignoreversion recursesubdirs createallsubdirs
+
+[INI]
+Filename: "{app}\wx.url"; Section: "InternetShortcut"; Key: "URL"; String: "http://www.wxwidgets.org"

 \r
 [Icons]\r
 \r
 [Icons]\r

-Name: "{group}\{cm:ProgramOnTheWeb,wxWidgets}"; Filename: "{app}\wx.url"
+Name: "{group}\{cm:ProgramOnTheWeb,wxWidgets}"; Filename: "{app}\wx.url"\r

 Name: {group}\wxWidgets Manual; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths\r
 Name: {group}\Changes; Filename: {app}\docs\changes.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths\r
 Name: {group}\Readme; Filename: {app}\docs\readme.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths\r
 Name: {group}\wxWidgets Manual; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths\r
 Name: {group}\Changes; Filename: {app}\docs\changes.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths\r
 Name: {group}\Readme; Filename: {app}\docs\readme.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths\r


@@ -61,4 +60,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