From a18fc6ce96fc2d8986d78a2322dc0e57924756dd Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 9 Dec 2018 16:09:54 +0100 Subject: [PATCH] Normalize line endings in wxwidgets.iss This file was a mix of DOS and Unix EOLs, convert it entirely to the former. No real changes. --- build/tools/wxwidgets.iss | 56 +++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/build/tools/wxwidgets.iss b/build/tools/wxwidgets.iss index ac503056b7..95c6bd2533 100644 --- a/build/tools/wxwidgets.iss +++ b/build/tools/wxwidgets.iss @@ -1,23 +1,23 @@ ; Script generated by the Inno Setup Script Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! -#if GetEnv("INNO") != "" - #define WXW_DIR GetEnv("INNO") -#else - #define WXW_DIR "..\.." -#endif - -#if GetEnv("WXW_VER") == "Snapshot" - #define INFOFILE WXW_DIR + "\BuildGit.txt" - #define WX_VERSION "Snapshot" -#elif GetEnv("WXW_VER") != "" - #define INFOFILE WXW_DIR + "\docs\msw\install.txt" - #define WX_VERSION GetEnv("WXW_VER") +#if GetEnv("INNO") != "" + #define WXW_DIR GetEnv("INNO") #else - #error "WXW_VER environment variable must be defined." + #define WXW_DIR "..\.." #endif -#define SETUPFILENAME "wxMSW-" + GetEnv("WXW_VER") + "-Setup" +#if GetEnv("WXW_VER") == "Snapshot" + #define INFOFILE WXW_DIR + "\BuildGit.txt" + #define WX_VERSION "Snapshot" +#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" @@ -32,22 +32,22 @@ DefaultDirName={sd}\wxWidgets-{#WX_VERSION} DefaultGroupName=wxWidgets {#WX_VERSION} UsePreviousAppDir=no DisableProgramGroupPage=yes -LicenseFile={#WXW_DIR}\docs\licence.txt -InfoBeforeFile={#WXW_DIR}\docs\readme.txt -InfoAfterFile={#INFOFILE} -OutputDir={#WXW_DIR}\.. -OutputBaseFilename={#SETUPFILENAME} -PrivilegesRequired=none -SetupIconFile={#WXW_DIR}\art\wxwin.ico +LicenseFile={#WXW_DIR}\docs\licence.txt +InfoBeforeFile={#WXW_DIR}\docs\readme.txt +InfoAfterFile={#INFOFILE} +OutputDir={#WXW_DIR}\.. +OutputBaseFilename={#SETUPFILENAME} +PrivilegesRequired=none +SetupIconFile={#WXW_DIR}\art\wxwin.ico Compression=lzma SolidCompression=yes - -[Files] -; source files -Source: "{#WXW_DIR}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs - -[INI] -Filename: "{app}\wx.url"; Section: "InternetShortcut"; Key: "URL"; String: "https://www.wxwidgets.org" + +[Files] +; source files +Source: "{#WXW_DIR}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs + +[INI] +Filename: "{app}\wx.url"; Section: "InternetShortcut"; Key: "URL"; String: "https://www.wxwidgets.org" [Icons] Name: "{group}\{cm:ProgramOnTheWeb,wxWidgets}"; Filename: "{app}\wx.url"