adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for installer so that it actually works again

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@760 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
ghaushe
2003-02-17 00:09:35 +00:00
parent 9eca0ee63b
commit 19f668b507
3 changed files with 83 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/build/win32_install/build_archives.pl
+50 -33
View File
@@ -4,14 +4,15 @@ use Cwd;
# set use_zip = 1 for .zip, = 0 for .tgz
$use_zip = 1;
$make_archive = 1;
$file = shift @ARGV;
$tag = shift @ARGV;
$do_full = shift @ARGV;
if (! defined ($file) || scalar(@ARGV)) {
print STDERR "$0 contour_file [full]\n";
print STDERR " or\n";
print STDERR "$0 cvs_log_file cvs_tag [full]\n";
# print STDERR " or\n";
# print STDERR "$0 cvs_log_file cvs_tag [full]\n";
exit 1;
}
# fetch the version from version.h
@@ -48,6 +49,7 @@ if (! defined ($do_full)) {
}
}
}
@dirs = ();
@changed = ();
@all = ();
$ignore = 0;
@@ -60,6 +62,9 @@ if ($use_zip) {
}
if ($tag) {
print STDERR "reading from a cvs log is not suppported\n";
exit 1;
if ($tag =~ /(\d+[._]\d+\S*)$/) {
$oldver = $1;
} else {
@@ -170,14 +175,15 @@ close FH1;
close FH2;
unlink "$cwd/$change_zip";
unlink "$cwd/$change_ogg_zip";
if ($use_zip) {
`cat tmpfile | zip -r "$cwd/$change_zip" -@`;
`cat tmpfile1 | zip -r "$cwd/$change_ogg_zip" -@` if ($change_ogg_size);
} else {
`tar -T tmpfile -czf "$cwd/$change_zip"`;
`tar -T tmpfile1 -czf "$cwd/$change_ogg_zip"` if ($change_ogg_size);
if ($make_archive) {
if ($use_zip) {
`cat tmpfile | zip -r "$cwd/$change_zip" -@`;
`cat tmpfile1 | zip -r "$cwd/$change_ogg_zip" -@` if ($change_ogg_size);
} else {
`tar -T tmpfile -czf "$cwd/$change_zip"`;
`tar -T tmpfile1 -czf "$cwd/$change_ogg_zip"` if ($change_ogg_size);
}
}
open (FH, ">$cwd/content.nsh");
print FH "!verbose 3\n";
print FH "!macro REMOVE_CONTENT\n";
@@ -191,7 +197,6 @@ $threedo_size = 0;
$num_voice = 0;
$num_content = 0;
$num_3do = 0;
@dirs = ();
foreach $path (@all) {
if (-f $path) {
($null,$null,$null,$null,$null,$null,$null,$siz1) = stat $path;
@@ -213,13 +218,23 @@ foreach $path (@all) {
}
if ($path =~ /^(.*\/)([^\/]+)$/) {
($dir, $file) = ($1, $2);
if ($dir ne $last_dir) {
push @dirs, $dir;
$last_dir = $dir;
@partdir = split /\//, $dir;
$newdir = "";
foreach $dir (@partdir) {
$newdir .= "/" if ($newdir);
$newdir .= "$dir";
if (! grep(m{^$newdir$}, @dirs)) {
unshift @dirs, $newdir;
}
}
$path =~ s/\//\\/g;
print FH "Delete \"\$INSTDIR\\content\\$path\"\n";
}
# if ($dir ne $last_dir) {
# push @dirs, $dir;
# $last_dir = $dir;
# }
# }
$path =~ s/\//\\/g;
print FH "Delete \"\$INSTDIR\\content\\$path\"\n";
}
close FH1;
close FH2;
@@ -253,7 +268,8 @@ $content_size = int(0.5 + $content_size / 1000);
$voice_size = int(0.5 + $voice_size / 1000);
$threedo_size = int(0.5 + $threedo_size / 1000);
print FH "!ifndef \${MUI_VERSION}\n";
print FH "!verbose 4\n\n";
print FH "!ifndef MUI_VERSION\n";
print FH " !define MUI_VERSION \"$version\"\n";
print FH "!endif\n";
print FH "\n";
@@ -264,58 +280,57 @@ print FH "!define UPGRADE_SIZE $change_size\n";
print FH "!define VUPGRADE_SIZE $change_ogg_size\n";
print FH "\n";
if ($do_full) {
print FH "!ifndef \${CONTENT_PACKAGE_FILE}\n";
print FH "!ifndef CONTENT_PACKAGE_FILE\n";
print FH " !define CONTENT_PACKAGE_FILE \"$content_zip\"\n";
print FH "!endif\n";
print FH "!ifndef \${CONTENT_TYPE}\n";
print FH "!ifndef CONTENT_TYPE\n";
print FH " !define CONTENT_TYPE \"$ext\"\n";
print FH "!endif\n";
print FH "!ifndef \${CONTENT_ROOT}\n";
print FH "!ifndef CONTENT_ROOT\n";
print FH " !define CONTENT_ROOT \"\\content\"\n";
print FH "!endif\n";
print FH "\n";
print FH "!ifndef \${VOICE_PACKAGE_FILE}\n";
print FH "!ifndef VOICE_PACKAGE_FILE\n";
print FH " !define VOICE_PACKAGE_FILE \"$voice_zip\"\n";
print FH "!endif\n";
print FH "!ifndef \${VOICE_TYPE}\n";
print FH "!ifndef VOICE_TYPE\n";
print FH " !define VOICE_TYPE \"$ext\"\n";
print FH "!endif\n";
print FH "!ifndef \${VOICE_ROOT}\n";
print FH "!ifndef VOICE_ROOT\n";
print FH " !define VOICE_ROOT \"\\content\"\n";
print FH "!endif\n";
print FH "\n";
print FH "!ifndef \${THREEDO_PACKAGE_FILE}\n";
print FH "!ifndef THREEDO_PACKAGE_FILE\n";
print FH " !define THREEDO_PACKAGE_FILE \"$threedo_zip\"\n";
print FH "!endif\n";
print FH "!ifndef \${THREEDO_TYPE}\n";
print FH "!ifndef THREEDO_TYPE\n";
print FH " !define THREEDO_TYPE \"$ext\"\n";
print FH "!endif\n";
print FH "!ifndef \${THREEDO_ROOT}\n";
print FH "!ifndef THREEDO_ROOT\n";
print FH " !define THREEDO_ROOT \"\\content\"\n";
print FH "!endif\n";
print FH "\n";
}
print FH "!ifndef \${UPGRADE_PACKAGE_FILE}\n";
print FH "!ifndef UPGRADE_PACKAGE_FILE\n";
print FH " !define UPGRADE_PACKAGE_FILE \"$change_zip\"\n";
print FH "!endif\n";
print FH "!ifndef \${UPGRADE_TYPE}\n";
print FH "!ifndef UPGRADE_TYPE\n";
print FH " !define UPGRADE_TYPE \"$ext\"\n";
print FH "!endif\n";
print FH "!ifndef \${UPGRADE_ROOT}\n";
print FH "!ifndef UPGRADE_ROOT\n";
print FH " !define UPGRADE_ROOT \"\\content\"\n";
print FH "!endif\n";
print FH "\n";
print FH "!ifndef \${VUPGRADE_PACKAGE_FILE}\n";
print FH "!ifndef VUPGRADE_PACKAGE_FILE\n";
print FH " !define VUPGRADE_PACKAGE_FILE \"$change_ogg_zip\"\n";
print FH "!endif\n";
print FH "!ifndef \${VUPGRADE_TYPE}\n";
print FH "!ifndef VUPGRADE_TYPE\n";
print FH " !define VUPGRADE_TYPE \"$ext\"\n";
print FH "!endif\n";
print FH "!ifndef \${VUPGRADE_ROOT}\n";
print FH "!ifndef VUPGRADE_ROOT\n";
print FH " !define VUPGRADE_ROOT \"\\content\"\n";
print FH "!endif\n";
print FH "\n";
print FH "!verbose 4\n";
close FH;
print "upgrade : #files: $num_change ($change_size kb)\n";
print "voiceupgrade: #files: $num_change_ogg ($change_ogg_size kb)\n";
@@ -328,7 +343,9 @@ exit;
sub find_callback {
my ($file) = $File::Find::name;
my ($dir) = $File::Find::dir;
return if ($dir !~ /(.*)\/CVS$/);
if ($dir !~ /(.*)\/CVS$/) {
return;
}
my ($root) = ($1 =~ /[^\/]*\/(.*)$/);
return if ($file !~ /Entries$/);
open FH_find, $_ or die "Can't read file '$file'\n";
sc2/build/win32_install/options.nsh
+6 -6
View File
@@ -1,12 +1,12 @@
!define OLD_VERSION "0.1" ; The earliest version that we can upgrade from
!define DOWNLOAD_LOCATION "http://sc2.sf.net/install_files/0.2"
!define MIRROR_LOCATION "http://sc2.sf.net/install_files/0.2/mirror.txt"
!define MIRROR_LOCATION "http://sc2.sf.net/install_files/0.2/mirrors.txt"
;!define CONTENT_USE_MIRROR 1 ; Define if the download should use a mirror
;!define VOICE_USE_MIRROR 1 ; Define if the download should use a mirror
;!define THREEDO_USE_MIRROR 1 ; Define if the download should use a mirror
;!define UPGRADE_USE_MIRROR 1 ; Define if the download should use a mirror
;!define VUPGRADE_USE_MIRROR 1 ; Define if the download should use a mirror
!define CONTENT_USE_MIRROR 1 ; Define if the download should use a mirror
!define VOICE_USE_MIRROR 1 ; Define if the download should use a mirror
!define THREEDO_USE_MIRROR 1 ; Define if the download should use a mirror
!define UPGRADE_USE_MIRROR 1 ; Define if the download should use a mirror
!define VUPGRADE_USE_MIRROR 1 ; Define if the download should use a mirror
; -----------------------------
; Only define these if you need fine control over where the archives are stored
sc2/build/win32_install/uqm.nsi
+26 -32
View File
@@ -4,89 +4,89 @@
!include "content.nsh"
; ***************** content **********************
!ifndef ${CONTENT_LOCATION}
!ifdef ${CONTENT_USE_MIRROR}
!ifndef CONTENT_LOCATION
!ifdef CONTENT_USE_MIRROR
!define CONTENT_LOCATION ${MIRROR_LOCATION}
!else
!define CONTENT_LOCATION ${DOWNLOAD_LOCATION}
!endif
!endif
!ifndef ${CONTENT_USE_MIRROR}
!ifndef CONTENT_USE_MIRROR
!define CONTENT_USE_MIRROR 0
!endif
!ifndef ${CONTENT_PACKAGE_FILE}
!ifndef CONTENT_PACKAGE_FILE
!define CONTENT_PACKAGE_FILE "uqm-${MUI_VERSION}-content.zip"
!endif
!ifndef ${CONTENT_TYPE}
!ifndef CONTENT_TYPE
!define CONTENT_TYPE "zip"
!endif
!ifndef ${CONTENT_ROOT}
!ifndef CONTENT_ROOT
!define CONTENT_ROOT "\content"
!endif
; ****************** voice **********************
!ifndef ${VOICE_LOCATION}
!ifdef ${VOICE_USE_MIRROR}
!ifndef VOICE_LOCATION
!ifdef VOICE_USE_MIRROR
!define VOICE_LOCATION ${MIRROR_LOCATION}
!else
!define VOICE_LOCATION ${DOWNLOAD_LOCATION}
!endif
!endif
!ifndef ${VOICE_USE_MIRROR}
!ifndef VOICE_USE_MIRROR
!define VOICE_USE_MIRROR 0
!endif
!ifndef ${VOICE_PACKAGE_FILE}
!ifndef VOICE_PACKAGE_FILE
!define VOICE_PACKAGE_FILE "uqm-${MUI_VERSION}-voice.zip"
!endif
!ifndef ${VOICE_TYPE}
!ifndef VOICE_TYPE
!define VOICE_TYPE "zip"
!endif
!ifndef ${VOICE_ROOT}
!ifndef VOICE_ROOT
!define VOICE_ROOT "\content"
!endif
; **************** 3do music *********************
!ifndef ${THREEDO_LOCATION}
!ifdef ${THREEDO_USE_MIRROR}
!ifndef THREEDO_LOCATION
!ifdef THREEDO_USE_MIRROR
!define THREEDO_LOCATION ${MIRROR_LOCATION}
!else
!define THREEDO_LOCATION ${DOWNLOAD_LOCATION}
!endif
!endif
!ifndef ${THREEDO_USE_MIRROR}
!ifndef THREEDO_USE_MIRROR
!define THREEDO_USE_MIRROR 0
!endif
!ifndef ${THREEDO_PACKAGE_FILE}
!ifndef THREEDO_PACKAGE_FILE
!define THREEDO_PACKAGE_FILE "uqm-${MUI_VERSION}-3domusic.zip"
!endif
!ifndef ${THREEDO_TYPE}
!ifndef THREEDO_TYPE
!define THREEDO_TYPE "zip"
!endif
!ifndef ${THREEDO_ROOT}
!ifndef THREEDO_ROOT
!define THREEDO_ROOT "\content"
!endif
; ***************** upgrade **********************
!ifndef ${UPGRADE_LOCATION}
!ifdef ${UPGRADE_USE_MIRROR}
!ifndef UPGRADE_LOCATION
!ifdef UPGRADE_USE_MIRROR
!define UPGRADE_LOCATION ${MIRROR_LOCATION}
!else
!define UPGRADE_LOCATION ${DOWNLOAD_LOCATION}
!endif
!endif
!ifndef ${UPGRADE_USE_MIRROR}
!ifndef UPGRADE_USE_MIRROR
!define UPGRADE_USE_MIRROR 0
!endif
; ************** voice upgrade *******************
!ifndef ${VUPGRADE_LOCATION}
!ifdef ${VUPGRADE_USE_MIRROR}
!ifndef VUPGRADE_LOCATION
!ifdef VUPGRADE_USE_MIRROR
!define VUPGRADE_LOCATION ${MIRROR_LOCATION}
!else
!define VUPGRADE_LOCATION ${DOWNLOAD_LOCATION}
!endif
!endif
!ifndef ${VUPGRADE_USE_MIRROR}
!ifndef VUPGRADE_USE_MIRROR
!define VUPGRADE_USE_MIRROR 0
!endif
@@ -179,10 +179,7 @@ SectionIn 1 2 RO
SetOutPath $INSTDIR
; Put file there
File "..\..\uqm.exe"
File "..\..\README"
File "..\..\NEWS"
File "..\..\ChangeLog"
File "..\..\TODO"
File "..\..\WhatsNew"
File "..\..\doc\users\manual.txt"
File "..\..\COPYING"
; Write the installation path into the registry
@@ -610,10 +607,7 @@ Section "Uninstall"
; remove files
Delete "$INSTDIR\uqm.exe"
Delete "$INSTDIR\README"
Delete "$INSTDIR\NEWS"
Delete "$INSTDIR\ChangeLog"
Delete "$INSTDIR\TODO"
Delete "$INSTDIR\WhatsNew"
Delete "$INSTDIR\manual.txt"
Delete "$INSTDIR\COPYING"
Delete "$INSTDIR\SDL.dll"