From d30353c1d2fa6608156d56ef6711d445edc7a75f Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 2 Jan 2015 20:44:07 -0800 Subject: [PATCH] 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 zcmcgwYfO|!6kXFM{nIqsG%boeL_<+P4I&DNq99H1RcHdHMi(E@O2PVw6iF2j{86Pu zPzhF1gR&(kC~OSSkQkI$9x1iP0tO!l3)?j%YpJbELAK{?z2xiXE<(~2bGh@)+u*Pd!T3Wg-IXPKpHk+sT`}-SQTwJXC_wUc2Hf@@f!Z!OjMw_Ih zBprRmi*L^kIB!>1S4VT~z<~oti9ct~9J9N-`{4BH)2)=LQ>WVaot>Sn6pqn`ZNzkx zzQiDwJ&v*Zo<4p0COLzGg6?BpJ;dZ($?4?eWD~a4-?U+D3l=QsUA%bl16Nm9E3wAn zQjRq@H-}ujcu{-(`t@+)Fa~mylU(!W%`hj>8;T(t! zT%+2jq@*MvJ3IR@;_ViG?4@5eZ{B=))22=O#Kgpsn3$Nlu&}V7loA>mdZ(_gE>iGt z);^4gi1>lF+qZB3cK!PGwQ+HAmBf;K;w*J%Wn~@4oD#$jxvgT(g_~OJU!|EF;uwua znEtb7jx=+?+)^;ND&eQbc{RzHXh%58{^H`|Pw0R4?Ab(R|5$CThe^0kpFX{F&6+ih zvu4eD#(8s(1P2FqQcyqcBQHa0EYzgVsHmv=$jHbh?rCDBq@)z8?fAWP>C!eYFE6u< zac(%*&sMKq-FWKMsh!7?4w{W+SXHIU=0;K(WrSzj~_pNk8Rf9mSO6X#AI$-nGB-c#_igolUUh92Cp zV@EM#Shj3gyYPy}zWto%y{D(gt*@`onRSwTK*mL*rhUab3Fqskr>Ext^!KR8f03VY zkh`d;XeZ7>6ZoH_)>V^p@7}%N;Jz7Ro9jqhir}&)OMXPNrpvhK88c>BShwlRdz!Z3 zx()szoaU*pr!Y6vN=|iK&7u637^!7{k%PFjqo#1*OAI=l z&UXI<1_pK`@1r(q-idrKU%ve3Cr_SCCP#aFyARi&^CAcDI^KE0FB*H@sLTWIxAs-5 zRy8AcU9S?H(?{?(peDEE=jW#hCf^}GK0d!Pc47mkPsWrQcV`Ue4jINCwb`y)x9;Y6 z-;S&`!^6X`DKQ5I2Hsk+V#OWd2JSFpz`N|F_s5I(mn+|2w2>Hi9y>ZZyp_1p<{5Mp zUrS3%5a#+wxQR(@gTdfx@BJm1<>lqt7kOX|BlM%BrKJ_HhKk*-TetjWFY%ot{j{O2 z>=j^*VqCg(Nh@}aG~y0n3^#7v2xlD31GU7lapT77+}zv@)+pTlpQ4?Pv-?|KUf!1* zHf*SonCK&ZzzXBLn%Itb)&0yXYBcX}z5{IMLW#+E#7API7903HLJjF;{EpU0{OxJ3 zQEhFl?Jhic@ZeF@GArv7>d~NZ;Js=>P4DM7xe@OmZTOv;nQ6OUi80oC+v8UE;qQiR zxKDIA&r|UBF(CK6Kk^w9g>ClXY#V5^Yu7FvebhMr#W(&2N*mrP* 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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 ''); -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}