mirror of https://github.com/rust-lang/rust.git
auto merge of #20456 : brson/rust/packaging2, r=alexcrichton
This commit is contained in:
bors
commit
fc2ba13939
108
mk/dist.mk
108
mk/dist.mk
|
|
@ -17,8 +17,6 @@
|
||||||
# * dist - make all distribution artifacts
|
# * dist - make all distribution artifacts
|
||||||
# * distcheck - sanity check dist artifacts
|
# * distcheck - sanity check dist artifacts
|
||||||
# * dist-tar-src - source tarballs
|
# * 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-tar-bins - Ad-hoc Unix binary installers
|
||||||
# * dist-docs - Stage docs for upload
|
# * dist-docs - Stage docs for upload
|
||||||
|
|
||||||
|
|
@ -106,108 +104,6 @@ distcheck-tar-src: dist-tar-src
|
||||||
$(Q)rm -Rf tmp/distcheck/srccheck
|
$(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
|
# Unix binary installer tarballs
|
||||||
######################################################################
|
######################################################################
|
||||||
|
|
@ -377,9 +273,9 @@ MAYBE_DIST_DOCS=dist-docs
|
||||||
MAYBE_DISTCHECK_DOCS=distcheck-docs
|
MAYBE_DISTCHECK_DOCS=distcheck-docs
|
||||||
endif
|
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
|
$(Q)rm -Rf tmp/distcheck
|
||||||
@echo
|
@echo
|
||||||
@echo -----------------------------------------------
|
@echo -----------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-dev
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# The name of the package to use for creating tarballs, installers etc.
|
# 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
|
# The version string plus commit information - this is what rustc reports
|
||||||
CFG_VERSION = $(CFG_RELEASE)
|
CFG_VERSION = $(CFG_RELEASE)
|
||||||
|
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
|
||||||
<installer-gui-script minSpecVersion="2">
|
|
||||||
<title>Rust</title>
|
|
||||||
<license file="LICENSE.txt" mime-type="text/plain"/>
|
|
||||||
<pkg-ref id="org.rust-lang.rust"/>
|
|
||||||
<options customize="never" require-scripts="false" hostArchitectures="i386,x86_64"/>
|
|
||||||
<volume-check>
|
|
||||||
<allowed-os-versions>
|
|
||||||
<os-version min="10.7"/>
|
|
||||||
</allowed-os-versions>
|
|
||||||
</volume-check>
|
|
||||||
<choices-outline>
|
|
||||||
<line choice="default">
|
|
||||||
<line choice="org.rust-lang.rust"/>
|
|
||||||
</line>
|
|
||||||
</choices-outline>
|
|
||||||
<choice id="default"
|
|
||||||
customLocation="usr/local"/>
|
|
||||||
<choice id="org.rust-lang.rust" visible="false">
|
|
||||||
<pkg-ref id="org.rust-lang.rust"/>
|
|
||||||
</choice>
|
|
||||||
<pkg-ref id="org.rust-lang.rust" version="0" onConclusion="none">rust.pkg</pkg-ref>
|
|
||||||
<welcome file="welcome.rtf" mime-type="text/enriched"/>
|
|
||||||
<background file="rust-logo.png" mime-type="image/png"
|
|
||||||
alignment="bottomleft"/>
|
|
||||||
</installer-gui-script>
|
|
||||||
|
|
@ -1,219 +0,0 @@
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
// Inno Setup Ver: 5.4.2
|
|
||||||
// Script Version: 1.4.1
|
|
||||||
// Author: Jared Breland <jbreland@legroom.net>
|
|
||||||
// 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;
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.7 KiB |
|
|
@ -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;
|
|
||||||
|
|
@ -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;
|
|
||||||
|
|
@ -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}
|
|
||||||
Loading…
Reference in New Issue