From e95cbb3aca19fe825f356998b42a069fb44d982d Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 2 Jan 2015 13:36:51 -0800 Subject: [PATCH 1/2] mk: Change package name from 'rust' to 'rustc' --- mk/main.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/main.mk b/mk/main.mk index 32167dfd899..e67bee3cab5 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -45,7 +45,7 @@ CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-dev endif # The name of the package to use for creating tarballs, installers etc. -CFG_PACKAGE_NAME=rust-$(CFG_PACKAGE_VERS) +CFG_PACKAGE_NAME=rustc-$(CFG_PACKAGE_VERS) # The version string plus commit information - this is what rustc reports CFG_VERSION = $(CFG_RELEASE) From d30353c1d2fa6608156d56ef6711d445edc7a75f Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 2 Jan 2015 20:44:07 -0800 Subject: [PATCH 2/2] Remove .pkg and .exe installers --- mk/dist.mk | 108 +---------------- src/etc/pkg/Distribution.xml | 26 ----- src/etc/pkg/modpath.iss | 219 ----------------------------------- src/etc/pkg/rust-logo.ico | Bin 4286 -> 0 bytes src/etc/pkg/rust-logo.png | Bin 5844 -> 0 bytes src/etc/pkg/rust.iss | 70 ----------- src/etc/pkg/upgrade.iss | 61 ---------- src/etc/pkg/welcome.rtf | 12 -- 8 files changed, 2 insertions(+), 494 deletions(-) delete mode 100644 src/etc/pkg/Distribution.xml delete mode 100644 src/etc/pkg/modpath.iss delete mode 100644 src/etc/pkg/rust-logo.ico delete mode 100644 src/etc/pkg/rust-logo.png delete mode 100644 src/etc/pkg/rust.iss delete mode 100644 src/etc/pkg/upgrade.iss delete mode 100644 src/etc/pkg/welcome.rtf diff --git a/mk/dist.mk b/mk/dist.mk index a8b331c6cc2..1d272a652ed 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -17,8 +17,6 @@ # * dist - make all distribution artifacts # * distcheck - sanity check dist artifacts # * dist-tar-src - source tarballs -# * dist-win - Windows exe installers -# * dist-osx - OS X .pkg installers # * dist-tar-bins - Ad-hoc Unix binary installers # * dist-docs - Stage docs for upload @@ -106,108 +104,6 @@ distcheck-tar-src: dist-tar-src $(Q)rm -Rf tmp/distcheck/srccheck -###################################################################### -# Windows .exe installer -###################################################################### - -# FIXME Needs to support all hosts, but making rust.iss compatible looks like a chore - -ifdef CFG_ISCC - -PKG_EXE = dist/$(PKG_NAME)-$(CFG_BUILD).exe - -%.iss: $(S)src/etc/pkg/%.iss - cp $< $@ - -%.ico: $(S)src/etc/pkg/%.ico - cp $< $@ - -$(PKG_EXE): rust.iss modpath.iss upgrade.iss LICENSE.txt rust-logo.ico \ - $(CSREQ3_T_$(CFG_BUILD)_H_$(CFG_BUILD)) \ - dist-prepare-win - $(Q)rm -rf tmp/dist/win/gcc - $(CFG_PYTHON) $(S)src/etc/make-win-dist.py tmp/dist/win/rust tmp/dist/win/gcc $(CFG_BUILD) - @$(call E, ISCC: $@) - $(Q)$(CFG_ISCC) $< - -$(eval $(call DEF_PREPARE,win)) - -dist-prepare-win: PREPARE_HOST=$(CFG_BUILD) -dist-prepare-win: PREPARE_TARGETS=$(CFG_BUILD) -dist-prepare-win: PREPARE_DEST_DIR=tmp/dist/win/rust -dist-prepare-win: PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD) -dist-prepare-win: PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD) -dist-prepare-win: PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD) -dist-prepare-win: PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD) -dist-prepare-win: PREPARE_CLEAN=true -dist-prepare-win: prepare-base-win - -endif - -dist-win: $(PKG_EXE) - -distcheck-win: dist-win - -###################################################################### -# OS X .pkg installer -###################################################################### - -ifeq ($(CFG_OSTYPE), apple-darwin) - -define DEF_OSX_PKG - -$$(eval $$(call DEF_PREPARE,osx-$(1))) - -dist-prepare-osx-$(1): PREPARE_HOST=$(1) -dist-prepare-osx-$(1): PREPARE_TARGETS=$(2) -dist-prepare-osx-$(1): PREPARE_DEST_DIR=tmp/dist/pkgroot-$(1) -dist-prepare-osx-$(1): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD) -dist-prepare-osx-$(1): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD) -dist-prepare-osx-$(1): PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD) -dist-prepare-osx-$(1): PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD) -dist-prepare-osx-$(1): prepare-base-osx-$(1) - -dist/$(PKG_NAME)-$(1).pkg: $(S)src/etc/pkg/Distribution.xml LICENSE.txt \ - dist-prepare-osx-$(1) \ - tmp/dist/pkgres-$(1)/LICENSE.txt \ - tmp/dist/pkgres-$(1)/welcome.rtf \ - tmp/dist/pkgres-$(1)/rust-logo.png - @$$(call E, making OS X pkg) - $(Q)pkgbuild --identifier org.rust-lang.rust --root tmp/dist/pkgroot-$(1) rust.pkg - $(Q)productbuild --distribution $(S)src/etc/pkg/Distribution.xml \ - --resources tmp/dist/pkgres-$(1) dist/$(PKG_NAME)-$(1).pkg - $(Q)rm -rf tmp rust.pkg - -tmp/dist/pkgres-$(1)/LICENSE.txt: LICENSE.txt - @$$(call E,pkg resource LICENSE.txt) - $(Q)mkdir -p $$(@D) - $(Q)cp $$< $$@ - -tmp/dist/pkgres-$(1)/%: $(S)src/etc/pkg/% - @$$(call E,pkg resource $$*) - $(Q)mkdir -p $$(@D) - $(Q)cp -r $$< $$@ - -endef - -ifneq ($(CFG_ENABLE_DIST_HOST_ONLY),) -$(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host),$(host)))) -else -$(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host),$(TARGET)))) -endif - -dist-osx: $(foreach host,$(CFG_HOST),dist/$(PKG_NAME)-$(host).pkg) - -else - -dist-osx: - -endif - -# FIXME should do something -distcheck-osx: dist-osx - - ###################################################################### # Unix binary installer tarballs ###################################################################### @@ -375,9 +271,9 @@ MAYBE_DIST_DOCS=dist-docs MAYBE_DISTCHECK_DOCS=distcheck-docs endif -dist: $(MAYBE_DIST_TAR_SRC) dist-osx dist-win dist-tar-bins $(MAYBE_DIST_DOCS) +dist: $(MAYBE_DIST_TAR_SRC) dist-tar-bins $(MAYBE_DIST_DOCS) -distcheck: $(MAYBE_DISTCHECK_TAR_SRC) distcheck-osx distcheck-win distcheck-tar-bins $(MAYBE_DISTCHECK_DOCS) +distcheck: $(MAYBE_DISTCHECK_TAR_SRC) distcheck-tar-bins $(MAYBE_DISTCHECK_DOCS) $(Q)rm -Rf tmp/distcheck @echo @echo ----------------------------------------------- diff --git a/src/etc/pkg/Distribution.xml b/src/etc/pkg/Distribution.xml deleted file mode 100644 index c7383c0bb1a..00000000000 --- a/src/etc/pkg/Distribution.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - Rust - - - - - - - - - - - - - - - - - - rust.pkg - - - diff --git a/src/etc/pkg/modpath.iss b/src/etc/pkg/modpath.iss deleted file mode 100644 index 35cc0097035..00000000000 --- a/src/etc/pkg/modpath.iss +++ /dev/null @@ -1,219 +0,0 @@ -// ---------------------------------------------------------------------------- -// -// Inno Setup Ver: 5.4.2 -// Script Version: 1.4.1 -// Author: Jared Breland -// Homepage: http://www.legroom.net/software -// License: GNU Lesser General Public License (LGPL), version 3 -// http://www.gnu.org/licenses/lgpl.html -// -// Script Function: -// Allow modification of environmental path directly from Inno Setup installers -// -// Instructions: -// Copy modpath.iss to the same directory as your setup script -// -// Add this statement to your [Setup] section -// ChangesEnvironment=true -// -// Add this statement to your [Tasks] section -// You can change the Description or Flags -// You can change the Name, but it must match the ModPathName setting below -// Name: modifypath; Description: &Add application directory to your environmental path; Flags: unchecked -// -// Add the following to the end of your [Code] section -// ModPathName defines the name of the task defined above -// ModPathType defines whether the 'user' or 'system' path will be modified; -// this will default to user if anything other than system is set -// setArrayLength must specify the total number of dirs to be added -// Result[0] contains first directory, Result[1] contains second, etc. -// const -// ModPathName = 'modifypath'; -// ModPathType = 'user'; -// -// function ModPathDir(): TArrayOfString; -// begin -// setArrayLength(Result, 1); -// Result[0] := ExpandConstant('{app}'); -// end; -// #include "modpath.iss" -// ---------------------------------------------------------------------------- - -procedure ModPath(); -var - oldpath: String; - newpath: String; - updatepath: Boolean; - pathArr: TArrayOfString; - aExecFile: String; - aExecArr: TArrayOfString; - i, d: Integer; - pathdir: TArrayOfString; - regroot: Integer; - regpath: String; - -begin - // Get constants from main script and adjust behavior accordingly - // ModPathType MUST be 'system' or 'user'; force 'user' if invalid - if ModPathType = 'system' then begin - regroot := HKEY_LOCAL_MACHINE; - regpath := 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment'; - end else begin - regroot := HKEY_CURRENT_USER; - regpath := 'Environment'; - end; - - // Get array of new directories and act on each individually - pathdir := ModPathDir(); - for d := 0 to GetArrayLength(pathdir)-1 do begin - updatepath := true; - - // Modify WinNT path - if UsingWinNT() = true then begin - - // Get current path, split into an array - RegQueryStringValue(regroot, regpath, 'Path', oldpath); - oldpath := oldpath + ';'; - i := 0; - - while (Pos(';', oldpath) > 0) do begin - SetArrayLength(pathArr, i+1); - pathArr[i] := Copy(oldpath, 0, Pos(';', oldpath)-1); - oldpath := Copy(oldpath, Pos(';', oldpath)+1, Length(oldpath)); - i := i + 1; - - // Check if current directory matches app dir - if pathdir[d] = pathArr[i-1] then begin - // if uninstalling, remove dir from path - if IsUninstaller() = true then begin - continue; - // if installing, flag that dir already exists in path - end else begin - updatepath := false; - end; - end; - - // Add current directory to new path - if i = 1 then begin - newpath := pathArr[i-1]; - end else begin - newpath := newpath + ';' + pathArr[i-1]; - end; - end; - - // Append app dir to path if not already included - if (IsUninstaller() = false) AND (updatepath = true) then - newpath := newpath + ';' + pathdir[d]; - - // Write new path - RegWriteStringValue(regroot, regpath, 'Path', newpath); - - // Modify Win9x path - end else begin - - // Convert to shortened dirname - pathdir[d] := GetShortName(pathdir[d]); - - // If autoexec.bat exists, check if app dir already exists in path - aExecFile := 'C:\AUTOEXEC.BAT'; - if FileExists(aExecFile) then begin - LoadStringsFromFile(aExecFile, aExecArr); - for i := 0 to GetArrayLength(aExecArr)-1 do begin - if IsUninstaller() = false then begin - // If app dir already exists while installing, skip add - if (Pos(pathdir[d], aExecArr[i]) > 0) then - updatepath := false; - break; - end else begin - // If app dir exists and = what we originally set, then delete at uninstall - if aExecArr[i] = 'SET PATH=%PATH%;' + pathdir[d] then - aExecArr[i] := ''; - end; - end; - end; - - // If app dir not found, or autoexec.bat didn't exist, then (create and) append to current path - if (IsUninstaller() = false) AND (updatepath = true) then begin - SaveStringToFile(aExecFile, #13#10 + 'SET PATH=%PATH%;' + pathdir[d], True); - - // If uninstalling, write the full autoexec out - end else begin - SaveStringsToFile(aExecFile, aExecArr, False); - end; - end; - end; -end; - -// Split a string into an array using passed delimeter -procedure Explode(var Dest: TArrayOfString; Text: String; Separator: String); -var - i: Integer; -begin - i := 0; - repeat - SetArrayLength(Dest, i+1); - if Pos(Separator,Text) > 0 then begin - Dest[i] := Copy(Text, 1, Pos(Separator, Text)-1); - Text := Copy(Text, Pos(Separator,Text) + Length(Separator), Length(Text)); - i := i + 1; - end else begin - Dest[i] := Text; - Text := ''; - end; - until Length(Text)=0; -end; - - -procedure ModPathCurStepChanged(CurStep: TSetupStep); -var - taskname: String; -begin - taskname := ModPathName; - if CurStep = ssPostInstall then - if IsTaskSelected(taskname) then - ModPath(); -end; - -procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep); -var - aSelectedTasks: TArrayOfString; - i: Integer; - taskname: String; - regpath: String; - regstring: String; - appid: String; -begin - // only run during actual uninstall - if CurUninstallStep = usUninstall then begin - // get list of selected tasks saved in registry at install time - appid := '{#emit SetupSetting("AppId")}'; - if appid = '' then appid := '{#emit SetupSetting("AppName")}'; - regpath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\'+appid+'_is1'); - RegQueryStringValue(HKLM, regpath, 'Inno Setup: Selected Tasks', regstring); - if regstring = '' then RegQueryStringValue(HKCU, regpath, 'Inno Setup: Selected Tasks', regstring); - - // check each task; if matches modpath taskname, trigger patch removal - if regstring <> '' then begin - taskname := ModPathName; - Explode(aSelectedTasks, regstring, ','); - if GetArrayLength(aSelectedTasks) > 0 then begin - for i := 0 to GetArrayLength(aSelectedTasks)-1 do begin - if comparetext(aSelectedTasks[i], taskname) = 0 then - ModPath(); - end; - end; - end; - end; -end; - -function NeedRestart(): Boolean; -var - taskname: String; -begin - taskname := ModPathName; - if IsTaskSelected(taskname) and not UsingWinNT() then begin - Result := True; - end else begin - Result := False; - end; -end; diff --git a/src/etc/pkg/rust-logo.ico b/src/etc/pkg/rust-logo.ico deleted file mode 100644 index e8e1f18df224101e38632043cfd043cdd329c4b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4286 zcmZQzU}RuqP*4ET3Jfa*7#PGD7#K7d7#I{77#JKFAmR)R3=9ndAQBb-|NozX6ue-; zg4}7-rd5FSq^72BNKH*$4`NT9I<*2M2VzqjuUN4nB{w&B+57kJ1x-v$p2*6|{;#dA zog^hC^&f;mY>*g84x}b0CubQ*4<+t+|Ngzu_U+q)KxWj{)lC4Iucf8+UO_?Or;Lou ze-M_Glmy!^EiL^Ygh6s3H6V6vZS4e*UXU3evp{T8@Ru)NctCbqSy|mRF)?`zG85!i zkew0|68}LM#0Fsy8-zh@kQ$KNjE#+-T3A@zlarJC4>F5byHA}uWxIOy>i9#44!MBL z0l5KWH_Uu}ef{T2NlEK^dU_h>&6}4E!XP$COixemIZPeQ9U%LU9692=YSpUvlP6Ew z5^@K~ZjikotgNj3W9!zf!ILLXt^oOM@#4j4KYsjR$7KdcZt~>G4 ze?jgCVUQbe=>^5n)2B~mVg3fG2blv>f9={eU3q!=pCC3d7^Dvr=D&acW&yby#0UB3 z;K73~AUi;Ip_{XL^X4#+8aX++KcFxN=>cI=Q`7q(Gm?{&*P`pe#rN~`I|9;cW@dI@ zK|$dMC{95B0htY=H*MM!hE1=Lk!rdT-@fYtgNMBVPSimot-ZtV+RL^D|`0r@q(GRef#zRH#fJlAhns9nad+0B6cPu zBy0qk1qu%kHZd`I)ZE2R+9>k1nB|cIdkR|`1<;u zP*G9&4)QlBjaXY--v(g|3yZt5va-L?&9t(zx*Zr8c+kts>m(>mgUl%_E1Q9?4#c;! zv%99Dq46HX24Rr@l$Djg`}p{rm_2)T!IUXeDv`s!xVU&O$UGPZrD2dhWPIYp35;^Y z*4Fk0vKkOOEiG*o$eg!t-->|J0LX3-2Kf_2Po6xv5+q+&S2qzP2Et31E=>iA!7!){ z1(}76=gpg!^Xkv113g&VlJOGc$Vt(gTu1!~f9u;JOGV=IZKt{@=fUj4*R<-@dKU-QC>? zG7Drs$j*d>gw5#opF4NX5~c@4!|Vs?gPBc;28A_9FFFR51t4=k_Jh(ue0=<7kQz|< zgZvM|Ha0dlPo6w!4H5@oSltKG2g6YNar$3LN$FcrQ4vZy+PHCJxSpQgOOV|ldtl)Y zOMjqxN=ZrShl`8LB_$=LpLuzCi$M0<+uL7<*$bm*&z_wR%I}XKKbC*??3pyEoCKu- zm^_SbX=&*M)k(g-zQ@$m)IRz8`W{zMQ1}J1ALI^@-E-&8E%5R2IVmS6_ctysZac`% z($dmd^78V(L2OVwg4BXA%v?~J43a~}pfVjM52F4#yE*=}xb=i=kzH-XA#5FHd0 zbPyzt4TH>{I(2H9xw-kh*4EZ8H8r*G+S=OhLEz#XrbjAUi;H9jML&$suDC6O-p4H6RSK-@(D*y0^FYDRXo42ZXShnb|{7 z``63M>-3~ald53mg4!WEIy!Ga{s5V4Zf^bzCWlOK-@ZKz_`9BH@3jaZB{r&xq zf%GG*!^H-bHGls6VMdn!^yw3ylatdGnB58r3V%T6Zr!>Sqx}JD6Fq(URPNBBLoOgS zFgJkmy@as;X(AG8Cr%!i5Vapg00yP&)@E4pIYB3$ho4<>lq!W~^DWCLX2^7k&El zXt_z!*nkFbJD*gwRPbw-ZKSAb$u#u6`OFcck zw;(pier09lpCC0Leq&=JxPAqh0WynNd$FlowQ5yLQBl#d4<9}VT3J~=QBqR+UteE8 z3FIaa2C+e6mX?-JKxzsL3zvcPU^9zSvBirQ=gyot6WssK%*@=7m6ZkVf6tgPqY@-X Ms`;p+0rckq0N8hMga7~l diff --git a/src/etc/pkg/rust-logo.png b/src/etc/pkg/rust-logo.png deleted file mode 100644 index 2c3de3000879b36b1dc4751ea5db0fa8fce4b5aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5844 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 PG^Xt7>gTe~DWM4f6Ze;# diff --git a/src/etc/pkg/rust.iss b/src/etc/pkg/rust.iss deleted file mode 100644 index 43df6256e0b..00000000000 --- a/src/etc/pkg/rust.iss +++ /dev/null @@ -1,70 +0,0 @@ -#define CFG_VERSION_WIN GetEnv("CFG_VERSION_WIN") -#define CFG_RELEASE GetEnv("CFG_RELEASE") -#define CFG_PACKAGE_NAME GetEnv("CFG_PACKAGE_NAME") -#define CFG_BUILD GetEnv("CFG_BUILD") - -[Setup] - -SetupIconFile=rust-logo.ico -AppName=Rust -AppVersion={#CFG_RELEASE} -AppCopyright=Copyright (C) 2006-2014 Mozilla Foundation, MIT license -AppPublisher=Mozilla Foundation -AppPublisherURL=http://www.rust-lang.org -VersionInfoVersion={#CFG_VERSION_WIN} -LicenseFile=LICENSE.txt - -PrivilegesRequired=lowest -DisableWelcomePage=true -DisableProgramGroupPage=true -DisableReadyPage=true -DisableStartupPrompt=true - -OutputDir=.\dist\ -SourceDir=.\ -OutputBaseFilename={#CFG_PACKAGE_NAME}-{#CFG_BUILD} -DefaultDirName={sd}\Rust - -Compression=lzma2/ultra -InternalCompressLevel=ultra -SolidCompression=true - -ChangesEnvironment=true -ChangesAssociations=no -AllowUNCPath=false -AllowNoIcons=true -Uninstallable=yes - -[Tasks] -Name: modifypath; Description: &Add {app}\bin to your PATH (recommended) - -[Components] -Name: rust; Description: "Rust compiler and standard crates"; Types: full compact custom; Flags: fixed -Name: gcc; Description: "Linker and platform libraries"; Types: full - -[Files] -Source: "tmp/dist/win/rust/*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: rust -Source: "tmp/dist/win/gcc/*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: gcc - -[Code] -const - ModPathName = 'modifypath'; - ModPathType = 'user'; - -function ModPathDir(): TArrayOfString; -begin - setArrayLength(Result, 1) - Result[0] := ExpandConstant('{app}\bin'); -end; - -#include "modpath.iss" -#include "upgrade.iss" - -// Both modpath.iss and upgrade.iss want to overload CurStepChanged. -// This version does the overload then delegates to each. - -procedure CurStepChanged(CurStep: TSetupStep); -begin - UpgradeCurStepChanged(CurStep); - ModPathCurStepChanged(CurStep); -end; diff --git a/src/etc/pkg/upgrade.iss b/src/etc/pkg/upgrade.iss deleted file mode 100644 index 29da7c333bb..00000000000 --- a/src/etc/pkg/upgrade.iss +++ /dev/null @@ -1,61 +0,0 @@ -// The following code taken from https://stackoverflow.com/questions/2000296/innosetup-how-to-automatically-uninstall-previous-installed-version -// It performs upgrades by running the uninstaller before the install - -///////////////////////////////////////////////////////////////////// -function GetUninstallString(): String; -var - sUnInstPath: String; - sUnInstallString: String; -begin - sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\Rust_is1'); - sUnInstallString := ''; - if not RegQueryStringValue(HKLM, sUnInstPath, 'UninstallString', sUnInstallString) then - RegQueryStringValue(HKCU, sUnInstPath, 'UninstallString', sUnInstallString); - Result := sUnInstallString; -end; - - -///////////////////////////////////////////////////////////////////// -function IsUpgrade(): Boolean; -begin - Result := (GetUninstallString() <> ''); -end; - - -///////////////////////////////////////////////////////////////////// -function UnInstallOldVersion(): Integer; -var - sUnInstallString: String; - iResultCode: Integer; -begin -// Return Values: -// 1 - uninstall string is empty -// 2 - error executing the UnInstallString -// 3 - successfully executed the UnInstallString - - // default return value - Result := 0; - - // get the uninstall string of the old app - sUnInstallString := GetUninstallString(); - if sUnInstallString <> '' then begin - sUnInstallString := RemoveQuotes(sUnInstallString); - if Exec(sUnInstallString, '/SILENT /NORESTART /SUPPRESSMSGBOXES','', SW_HIDE, ewWaitUntilTerminated, iResultCode) then - Result := 3 - else - Result := 2; - end else - Result := 1; -end; - -///////////////////////////////////////////////////////////////////// -procedure UpgradeCurStepChanged(CurStep: TSetupStep); -begin - if (CurStep=ssInstall) then - begin - if (IsUpgrade()) then - begin - UnInstallOldVersion(); - end; - end; -end; diff --git a/src/etc/pkg/welcome.rtf b/src/etc/pkg/welcome.rtf deleted file mode 100644 index 2433348998e..00000000000 --- a/src/etc/pkg/welcome.rtf +++ /dev/null @@ -1,12 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf190 -{\fonttbl\f0\fswiss\fcharset0 Helvetica;} -{\colortbl;\red255\green255\blue255;} -\margl1440\margr1440\vieww10800\viewh6300\viewkind0 -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\f0\fs28 \cf0 \ -\ - You will be guided through the steps necessary to\ - install this software.\ -\ - This will install Rust to /usr/local}