From 0e7d39b9414aff671dd9d65cc89d4c4974966d61 Mon Sep 17 00:00:00 2001 From: dolphin6k Date: Fri, 15 Oct 2021 16:26:37 +0900 Subject: [PATCH] Removed OpenCandy stuff and localized COPYINGs. --- win32/tuxpaint.iss | 240 ++++++--------------------------------------- 1 file changed, 30 insertions(+), 210 deletions(-) diff --git a/win32/tuxpaint.iss b/win32/tuxpaint.iss index 806f7fe5c..cecae2c8e 100644 --- a/win32/tuxpaint.iss +++ b/win32/tuxpaint.iss @@ -5,14 +5,6 @@ ; ; The version string is extracted from the executable. ; -; As of 2011.06.15, this integrates OpenCandy advertising module. -; However, by default, using "tuxpaint.iss", the standard Tux Paint installer -; will be built. Use "tuxpaint-opencandy.iss" (and you will need the -; product key and secret, stored in a "tuxpaint-opencandy-secrets.iss" file; -; Bill Kendrick has access to these), which sets up a #define and then -; #include's this file, to produce an installer with OpenCandy built-in. -; -bjk - ; Should we change this to Tux4Kids? -bjk 2011.06.15 #define PublisherName "New Breed Software" #define PublisherURL "{code:MyPublisherURL}" @@ -29,35 +21,11 @@ #define AppConfigName AppName+" Config" #define AppConfigExe AppPrefix+"-config.exe" #define AppReadme "{code:MyReadme}" -#define AppLicence "{code:MyLicence}" +#define AppLicense "docs\COPYING.txt" #define BdistDir ".\bdist" #define AppVersion GetStringFileInfo(BdistDir+"\"+AppExe, "FileVersion") - -#ifdef OpenCandy -#define OC_STR_MY_PRODUCT_NAME "Tux Paint" -;// Note: Please change the registry path to match your company name -;#define OC_STR_REGISTRY_PATH "Software\Tux Paint\OpenCandy" -#define OC_OCSETUPHLP_FILE_PATH ".\OCSetupHlp.dll" -#include 'tuxpaint-opencandy-secrets.iss' -;#if OC_STR_MY_PRODUCT_NAME == "Open Candy Sample" -; #pragma warning "Do not forget to change the product name from 'Open Candy Sample' to your company's product name before releasing this installer." -;#endif -;#if OC_STR_KEY == "1401d0bd8048e1f0f4628dbec1a73092" -; #pragma warning "Do not forget to change the test key '1401d0bd8048e1f0f4628dbec1a73092' to your company's product key before releasing this installer." -;#endif -;#if OC_STR_SECRET == "4564bdaf826bbe2115718d1643ecc19e" -; #pragma warning "Do not forget to change the test secret '4564bdaf826bbe2115718d1643ecc19e' to your company's product secret before releasing this installer." -;#endif -;#if OC_STR_REGISTRY_PATH == "Software\Your Company\OpenCandy" -; #pragma warning "Do not forget to change the test registry path 'Your Company' to your companies name before releasing this installer." -;#endif -;#if Pos(LowerCase("Software\OpenCandy"),LowerCase(OC_STR_REGISTRY_PATH)) != 0 -; #pragma warning "ERROR, your registry path has OpenCandy before your company name. Please place your company name before OpenCandy. eg Software\Your Company\OpenCandy" -;#endif -#endif - [Setup] AppName={#AppName} AppVerName={#AppName} {#AppVersion} @@ -69,13 +37,7 @@ AppVersion={#AppVersion} DefaultDirName={pf}\{#AppDirName} DefaultGroupName={#AppGroupName} OutputDir=.\ -#ifdef OpenCandy - LicenseFile={#BdistDir}\docs\COPYING-OC.txt - OutputBaseFilename={#AppPrefix}-{#AppVersion}-win32-installer-opencandy -#else - LicenseFile={#BdistDir}\docs\COPYING\COPYING-en.txt - OutputBaseFilename={#AppPrefix}-{#AppVersion}-win32-installer -#endif +OutputBaseFilename={#AppPrefix}-{#AppVersion}-windows-installer SetupIconFile={#BdistDir}\data\images\tuxpaint-installer.ico WizardStyle=modern Compression=lzma2 @@ -87,47 +49,47 @@ Name: "afr"; MessagesFile: "compiler:Languages\Afrikaans.isl" Name: "alb"; MessagesFile: "compiler:Languages\Albanian.isl" Name: "ara"; MessagesFile: "compiler:Languages\Arabic.isl" Name: "arm"; MessagesFile: "compiler:Languages\Armenian.islu" -Name: "ast"; MessagesFile: "compiler:Languages\Asturian.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-es-COPIADO.txt" +Name: "ast"; MessagesFile: "compiler:Languages\Asturian.isl" Name: "baq"; MessagesFile: "compiler:Languages\Basque.isl" -Name: "bel"; MessagesFile: "compiler:Languages\Belarusian.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-be.txt" +Name: "bel"; MessagesFile: "compiler:Languages\Belarusian.isl" Name: "ben"; MessagesFile: "compiler:Languages\Bengali.islu" Name: "bos"; MessagesFile: "compiler:Languages\Bosnian.isl" -Name: "bra"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING_pt_BR.txt" -Name: "bul"; MessagesFile: "compiler:Languages\Bulgarian.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-bg.txt" -Name: "cat"; MessagesFile: "compiler:Languages\Catalan.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-ca.txt" -Name: "chs"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-zh_cn.txt" -Name: "cht"; MessagesFile: "compiler:Languages\ChineseTraditional.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-zh_tw_GNU_GPL_Chinese.txt" +Name: "bra"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl" +Name: "bul"; MessagesFile: "compiler:Languages\Bulgarian.isl" +Name: "cat"; MessagesFile: "compiler:Languages\Catalan.isl" +Name: "chs"; MessagesFile: "compiler:Languages\ChineseSimplified.isl" +Name: "cht"; MessagesFile: "compiler:Languages\ChineseTraditional.isl" Name: "cnr"; MessagesFile: "compiler:Languages\Montenegrian.isl" Name: "cos"; MessagesFile: "compiler:Languages\Corsican.isl" -Name: "cze"; MessagesFile: "compiler:Languages\Czech.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-cs.txt" -Name: "dan"; MessagesFile: "compiler:Languages\Danish.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-da.txt" -Name: "dut"; MessagesFile: "compiler:Languages\Dutch.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-nl.txt" +Name: "cze"; MessagesFile: "compiler:Languages\Czech.isl" +Name: "dan"; MessagesFile: "compiler:Languages\Danish.isl" +Name: "dut"; MessagesFile: "compiler:Languages\Dutch.isl" Name: "enb"; MessagesFile: "compiler:Languages\EnglishBritish.isl" Name: "eng"; MessagesFile: "compiler:Default.isl" Name: "epo"; MessagesFile: "compiler:Languages\Esperanto.isl" -Name: "esp"; MessagesFile: "compiler:Languages\Spanish.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-es-COPIADO.txt" +Name: "esp"; MessagesFile: "compiler:Languages\Spanish.isl" Name: "est"; MessagesFile: "compiler:Languages\Estonian.isl" Name: "fas"; MessagesFile: "compiler:Languages\Farsi.isl" -Name: "fin"; MessagesFile: "compiler:Languages\Finnish.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-fi.txt" -Name: "fre"; MessagesFile: "compiler:Languages\French.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-fr-COPIER.txt" +Name: "fin"; MessagesFile: "compiler:Languages\Finnish.isl" +Name: "fre"; MessagesFile: "compiler:Languages\French.isl" Name: "gal"; MessagesFile: "compiler:Languages\Galician.isl" Name: "geo"; MessagesFile: "compiler:Languages\Georgian.islu" -Name: "ger"; MessagesFile: "compiler:Languages\German.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-de-KOPIE.txt" +Name: "ger"; MessagesFile: "compiler:Languages\German.isl" Name: "gla"; MessagesFile: "compiler:Languages\ScottishGaelic.isl" -Name: "gre"; MessagesFile: "compiler:Languages\Greek.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-el.txt" -Name: "heb"; MessagesFile: "compiler:Languages\Hebrew.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-he.txt" +Name: "gre"; MessagesFile: "compiler:Languages\Greek.isl" +Name: "heb"; MessagesFile: "compiler:Languages\Hebrew.isl" Name: "hin"; MessagesFile: "compiler:Languages\Hindi.islu" Name: "hun"; MessagesFile: "compiler:Languages\Hungarian.isl" Name: "ice"; MessagesFile: "compiler:Languages\Icelandic.isl" -Name: "ind"; MessagesFile: "compiler:Languages\Indonesian.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-id.txt" -Name: "ita"; MessagesFile: "compiler:Languages\Italian.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-it-COPIATURA.txt" -Name: "jpn"; MessagesFile: "compiler:Languages\Japanese.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-ja.txt" +Name: "ind"; MessagesFile: "compiler:Languages\Indonesian.isl" +Name: "ita"; MessagesFile: "compiler:Languages\Italian.isl" +Name: "jpn"; MessagesFile: "compiler:Languages\Japanese.isl" Name: "kaz"; MessagesFile: "compiler:Languages\Kazakh.islu" -Name: "kor"; MessagesFile: "compiler:Languages\Korean.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-ko.txt" +Name: "kor"; MessagesFile: "compiler:Languages\Korean.isl" Name: "kur"; MessagesFile: "compiler:Languages\Kurdish.isl" Name: "lav"; MessagesFile: "compiler:Languages\Latvian.isl" Name: "lij"; MessagesFile: "compiler:Languages\Ligurian.isl" -Name: "lit"; MessagesFile: "compiler:Languages\Lithuanian.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-lt.txt" +Name: "lit"; MessagesFile: "compiler:Languages\Lithuanian.isl" Name: "ltz"; MessagesFile: "compiler:Languages\Luxemburgish.isl" Name: "mac"; MessagesFile: "compiler:Languages\Macedonian.isl" Name: "mar"; MessagesFile: "compiler:Languages\Marathi.islu" @@ -137,20 +99,20 @@ Name: "nep"; MessagesFile: "compiler:Languages\Nepali.islu" Name: "nno"; MessagesFile: "compiler:Languages\NorwegianNynorsk.isl" Name: "nor"; MessagesFile: "compiler:Languages\Norwegian.isl" Name: "occ"; MessagesFile: "compiler:Languages\Occitan.isl" -Name: "pol"; MessagesFile: "compiler:Languages\Polish.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-pl-LICENCJA-GNU.txt" +Name: "pol"; MessagesFile: "compiler:Languages\Polish.isl" Name: "por"; MessagesFile: "compiler:Languages\Portuguese.isl" Name: "rum"; MessagesFile: "compiler:Languages\Romanian.isl" -Name: "rus"; MessagesFile: "compiler:Languages\Russian.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-ro.txt" -Name: "scc"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-sr.txt" -Name: "scl"; MessagesFile: "compiler:Languages\SerbianLatin.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-sr.txt" +Name: "rus"; MessagesFile: "compiler:Languages\Russian.isl" +Name: "scc"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl" +Name: "scl"; MessagesFile: "compiler:Languages\SerbianLatin.isl" Name: "scr"; MessagesFile: "compiler:Languages\Croatian.isl" Name: "sin"; MessagesFile: "compiler:Languages\Sinhala.islu" Name: "slo"; MessagesFile: "compiler:Languages\Slovak.isl" Name: "slv"; MessagesFile: "compiler:Languages\Slovenian.isl" -Name: "swe"; MessagesFile: "compiler:Languages\Swedish.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-sv.txt" +Name: "swe"; MessagesFile: "compiler:Languages\Swedish.isl" Name: "tai"; MessagesFile: "compiler:Languages\Thai.isl" Name: "tat"; MessagesFile: "compiler:Languages\Tatar.isl" -Name: "tur"; MessagesFile: "compiler:Languages\Turkish.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-tr.txt" +Name: "tur"; MessagesFile: "compiler:Languages\Turkish.isl" Name: "uig"; MessagesFile: "compiler:Languages\Uyghur.islu" Name: "ukr"; MessagesFile: "compiler:Languages\Ukrainian.isl" Name: "uzb"; MessagesFile: "compiler:Languages\Uzbek.isl" @@ -172,12 +134,6 @@ Source: "{#BdistDir}\locale\*"; DestDir: "{app}\locale"; Excludes: "CVS"; Flags: Source: "{#BdistDir}\..\libdocs\*"; DestDir: "{app}\docs\libdocs"; Excludes: "CVS,Makefile,*~"; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files -#ifdef OpenCandy - Source: "{#OC_OCSETUPHLP_FILE_PATH}"; Flags: dontcopy ignoreversion; -#endif - - - [INI] Filename: "{code:MyGroupDir}\{groupname}\{cm:ProgramOnTheWeb,{#AppName}}.url"; Section: "InternetShortcut"; Key: "URL"; String: "{#PublisherURL}" @@ -186,7 +142,7 @@ Name: "{code:MyGroupDir}\{groupname}\Configure {#AppName}"; Filename: "{app}\{#A Name: "{code:MyGroupDir}\{groupname}\{#AppName} (Full Screen)"; Filename: "{app}\{#AppExe}"; Parameters: "--fullscreen native"; Comment: "Start {#AppName} in Fullscreen mode" Name: "{code:MyGroupDir}\{groupname}\{#AppName} (Windowed)"; Filename: "{app}\{#AppExe}"; Parameters: "--windowed"; Comment: "Start {#AppName} in a Window" Name: "{code:MyGroupDir}\{groupname}\Readme"; Filename: "{app}\{#AppReadme}"; Comment: "View ReadMe" -Name: "{code:MyGroupDir}\{groupname}\Licence"; Filename: "{app}\{#AppLicence}"; Comment: "View License" +Name: "{code:MyGroupDir}\{groupname}\License"; Filename: "{app}\{#AppLicense}"; Comment: "View License" Name: "{code:MyGroupDir}\{groupname}\{cm:UninstallProgram,{#AppName}}"; Filename: "{uninstallexe}"; IconFilename: "{app}\data\images\tuxpaint-installer.ico"; Comment: "Remove {#AppName}" Name: "{code:MyDesktopDir}\{#AppName}"; Filename: "{app}\{#AppExe}"; Tasks: desktopicon @@ -204,10 +160,6 @@ Filename: "{app}\{#AppConfigExe}"; Description: "{cm:LaunchProgram,{#AppConfigNa Type: files; Name: "{code:MyGroupDir}\{groupname}\{cm:ProgramOnTheWeb,{#AppName}}.url" [code] -#ifdef OpenCandy -#include 'OCSetupHlp.iss' -#endif - const CSIDL_PROFILE = $0028; CSIDL_COMMON_PROGRAMS = $0017; @@ -215,9 +167,6 @@ const var InstallTypePageID: Integer; CheckListBox2: TNewCheckListBox; -#ifdef OpenCandy - OCtszInstallerLanguage: OCTString; -#endif function Restricted(): Boolean; begin Result := not (IsAdminLoggedOn() or IsPowerUserLoggedOn()) @@ -318,51 +267,16 @@ begin begin WizardForm.DirEdit.Text := MyAppDir(); end; - begin - #ifdef OpenCandy - OpenCandyCurPageChanged(CurPageID); - #endif - end; end; function ShouldSkipPage(PageID: Integer): Boolean; begin Result := (PageID = InstallTypePageID) and Is9xME(); - begin - #ifdef OpenCandy - Result := OpenCandyShouldSkipPage(PageID); - #endif - end; end; -#ifdef OpenCandy -function NextButtonClick(CurPageID: Integer): Boolean; -begin - Result := OpenCandyNextButtonClick(CurPageID); -end; -#endif - function BackButtonClick(CurPageID: Integer): Boolean; begin Result := true; // Allow action by default - - #ifdef OpenCandy - OpenCandyBackButtonClick(CurPageID); - #endif -end; - -procedure DeinitializeSetup(); -begin - #ifdef OpenCandy - OpenCandyDeinitializeSetup(); - #endif -end; - -procedure CurStepChanged(CurStep: TSetupStep); -begin - #ifdef OpenCandy - OpenCandyCurStepChanged(CurStep); - #endif end; function Lang2Gettext(TwoLetter: Boolean): String; @@ -614,10 +528,6 @@ begin begin CreateTheWizardPages; end -#ifdef OpenCandy - OCtszInstallerLanguage := Lang2Gettext(true); - OpenCandyAsyncInit('{#OC_STR_MY_PRODUCT_NAME}', '{#OC_STR_KEY}', '{#OC_STR_SECRET}', OCtszInstallerLanguage, {#OC_INIT_MODE_NORMAL}); - #endif end; function MyReadme(Default: String): String; @@ -658,95 +568,6 @@ begin Result := 'docs\'+readme end; -function MyLicence(Default: String): String; -var - lang, licence: String; -begin - lang := Lang2Gettext(false); - - if lang = 'pt_br' then - licence := 'COPYING_pt_BR.txt' - else - if lang = 'be' then - licence := 'COPYING-be.txt' - else - if lang = 'bg' then - licence := 'COPYING-bg.txt' - else - if lang = 'ca' then - licence := 'COPYING-ca.txt' - else - if lang = 'cs' then - licence := 'COPYING-cs.txt' - else - if lang = 'cy' then - licence := 'COPYING-cy.txt' - else - if lang = 'da' then - licence := 'COPYING-da.txt' - else - if lang = 'de' then - licence := 'COPYING-de-KOPIE.txt' - else - if lang = 'el' then - licence := 'COPYING-el.txt' - else - if lang = 'es' then - licence := 'COPYING-es-COPIADO.txt' - else - if lang = 'fi' then - licence := 'COPYING-fi.txt' - else - if lang = 'fr' then - licence := 'COPYING-fr-COPIER.txt' - else - if lang = 'he' then - licence := 'COPYING-he.txt' - else - if lang = 'id' then - licence := 'COPYING-id.txt' - else - if lang = 'it' then - licence := 'COPYING-it-COPIATURA.txt' - else - if lang = 'ja' then - licence := 'COPYING-ja.txt' - else - if lang = 'ko' then - licence := 'COPYING-ko.txt' - else - if lang = 'lt' then - licence := 'COPYING-lt.txt' - else - if lang = 'nl' then - licence := 'COPYING-nl.txt' - else - if lang = 'pl' then - licence := 'COPYING-pl-LICENCJA-GNU.txt' - else - if lang = 'ro' then - licence := 'COPYING-ro.txt' - else - if lang = 'sr' then - licence := 'COPYING-sr.txt' - else - if lang = 'sv' then - licence := 'COPYING-sv.txt' - else - if lang = 'tr' then - licence := 'COPYING-tr.txt' - else - if lang = 'zh_cn' then - licence := 'COPYING-zh_cn.txt' - else - if lang = 'zh_tw' then - licence := 'COPYING-zh_tw_GNU_GPL_Chinese.txt' - else - licence := 'COPYING-en.txt'; - - Result := 'docs\COPYING\'+licence -end; - function MyPublisherURL(Default: String): String; var lang: String; @@ -805,4 +626,3 @@ begin end; #expr SaveToFile(AddBackslash(SourcePath) + 'Preprocessed.iss') -