diff --git a/stepmania/PBProject/scripts/mkrelease.pl b/stepmania/PBProject/scripts/mkrelease.pl index fd1a32cfaf..556bf768c3 100755 --- a/stepmania/PBProject/scripts/mkrelease.pl +++ b/stepmania/PBProject/scripts/mkrelease.pl @@ -7,28 +7,6 @@ use File::Basename; use File::Temp qw/tempfile tempdir/; use Cwd; -my @filelist = qw( Announcers/instructions.txt - BackgroundTransitions - BackgroundEffects - BGAnimations/instructions.txt - CDTitles/Instructions.txt - Characters/default - Characters/Instructions.txt - Courses/instructions.txt - Courses/Samples - Packages/Instructions.txt - NoteSkins/instructions.txt - NoteSkins/common/common - NoteSkins/dance/default - RandomMovies/instructions.txt - Songs/Instructions.txt - Themes/instructions.txt - Themes/default - Data/Translations.xml - Data/AI.ini - Data/Shaders - Data/splash.png - StepMania.app ); my @docs = ( "BGAnimation conditionals.txt", "BMA-fmt.txt", "ConditionalBGA Info.txt", @@ -64,117 +42,17 @@ my $destname = @ARGV ? "$id-$ARGV[0]" : "$family-$ver"; $destname =~ s/\s+/-/g; -my $destdir = tempdir; -my $smdir = "$destdir/$id"; -my $pkg = "$root/$destname.pkg"; -my $zip = "$root/$destname-mac.zip"; +my $tmp = tempdir; -for( @filelist ) -{ - mkpath "$smdir/" . dirname $_; - system 'cp', '-r', "$srcdir/$_", "$smdir/$_" and die "cp -r failed: $!\n"; -} +# Copy StepMania and make smzip +system 'cp', '-r', "$srcdir/StepMania.app", $tmp and die "cp -r failed: $!\n"; +system 'strip', '-x', "$tmp/StepMania.app/Contents/MacOS/StepMania"; +system "$srcdir/Utils/mksmdata.pl", $srcdir, "$tmp/StepMania.app/Contents/Resources" and die "mksmdata.pl failed: $!\n"; # Copy docs -mkdir "$smdir/Docs"; -copy "$srcdir/Docs/$_", "$smdir/Docs/$_" for @docs; +mkdir "$tmp/Docs"; +copy "$srcdir/Docs/$_", "$tmp/Docs/$_" for @docs; -#clean up CVS directories -my @cvsdirs = split /\n/, `find "$smdir" -type d -name CVS`; -rmtree \@cvsdirs; -system 'strip', '-x', "$smdir/StepMania.app/Contents/MacOS/StepMania"; - -my ($ih, $infoname) = tempfile; -my ($dh, $descname) = tempfile; -my $year = 1900+(localtime)[5]; - -$ver =~ /(\d+)\.(\d+)/; -my ($major, $minor) = ($1, $2); -$major ||= 0; -$minor ||= 0; - -print $ih < - - - - CFBundleGetInfoString - $ver, Copyright ©2001-$year $family - CFBundleIdentifier - com.$family.$id - CFBundleShortVersionString - $major.$minor - IFMajorVersion - $major - IFMinorVersion - $minor - IFPkgFlagAllowBackRev - - IFPkgFlagAuthorizationAction - AdminAuthorization - IFPkgFlagBackgroundAlignment - center - IFPkgFlagBackgroundScaling - none - IFPkgFlagDefaultLocation - /Applications - IFPkgFlagFollowLinks - - IFPkgFlagInstallFat - - IFPkgFlagInstalledSize - 36080 - IFPkgFlagIsRequired - - IFPkgFlagOverwritePermissions - - IFPkgFlagRelocatable - - IFPkgFlagRestartAction - NoRestart - IFPkgFlagRootVolumeOnly - - IFPkgFlagUpdateInstalledLanguages - - IFPkgFormatVersion - 0.10000000149011612 - - -EOF -close $ih; -print $dh < - - - - IFPkgDescriptionDescription - - IFPkgDescriptionTitle - $id - - -EOF -close $dh; -if( -e $pkg ) -{ - print "Removing $pkg\n"; - rmtree "$pkg"; -} -my @headerdir = split /\n/, `find "$smdir/StepMania.app" -type d -name Headers`; -rmtree \@headerdir; -my $pm = -'/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker'; -system $pm, '-build', '-p', $pkg, '-f', $destdir, '-ds', - '-i', $infoname, '-d', $descname; -unlink $infoname, $descname; -rmtree $destdir; -print "Created $destname.pkg.\n"; -if( -e $zip ) -{ - print "Removing $zip\n"; - unlink $zip; -} -chdir $root; -system '/usr/bin/zip', '-9Tqyr', $zip, "$destname.pkg"; -print "Created $destname-mac.zip.\n"; +# Make a dmg +system qw/hdiutil create -ov -format UDZO -imagekey zlib-level=9 -srcfolder/, $tmp, '-volname', $destname, "$root/$destname-mac.dmg"; +rmtree $tmp;