From 1f060c07285186d68fab9a427dc99509fad6eb19 Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Sat, 11 Nov 2006 12:05:33 +0000 Subject: [PATCH] copy CHM files; change location of version git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/script/wxwidgets.iss | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/build/script/wxwidgets.iss b/build/script/wxwidgets.iss index 397b4f5649..cac662c0d2 100644 --- a/build/script/wxwidgets.iss +++ b/build/script/wxwidgets.iss @@ -1,14 +1,14 @@ ; Script generated by the Inno Setup Script Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! -#if GetEnv("WXW_VER") != "" +#if GetEnv("WXW_VER") == "CVS" #define INFOFILE "C:\wx\inno\wxWidgets\BuildCVS.txt" - #define SETUPFILENAME "wxMSW-" + GetENV("WXW_VER") + "-Setup" - #define WX_VERSION GetENV("WXW_VER") -#else - #define INFOFILE "C:\wx\inno\wxWidgets\docs\msw\install.txt" #define SETUPFILENAME "wxMSW-cvs-Setup" #define WX_VERSION "CVS" +#else + #define INFOFILE "C:\wx\inno\wxWidgets\docs\msw\install.txt" + #define SETUPFILENAME "wxMSW-" + GetENV("WXW_VER") + "-Setup" + #define WX_VERSION GetENV("WXW_VER") #endif @@ -40,7 +40,8 @@ Source: "C:\wx\inno\wxWidgets\*"; DestDir: "{app}"; Flags: ignoreversion recurse Filename: "{app}\wx.url"; Section: "InternetShortcut"; Key: "URL"; String: "http://www.wxwidgets.org" [Icons] -Name: "{group}\{cm:ProgramOnTheWeb,wxWidgets {#WX_VERSION} }"; Filename: "{app}\wx.url" +Name: "{group}\{cm:ProgramOnTheWeb,wxWidgets {#WX_VERSION}}"; Filename: "{app}\wx.url" +Name: {group}\wxWidgets Manual; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths [UninstallDelete]