From 5f0ff66f81ceca6339c403bce682ee60a68b0df9 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Fri, 30 Apr 2010 17:00:39 -0500
Subject: [PATCH] update packagers to point to midi-* noteskins

---
 Utils/CreatePackage.pl | 335 +++++++++++++++++++++--------------------
 sm-ssc.nsi             |  14 +-
 2 files changed, 183 insertions(+), 166 deletions(-)

diff --git a/Utils/CreatePackage.pl b/Utils/CreatePackage.pl
index 321d7a0419..82ae8ca431 100644
--- a/Utils/CreatePackage.pl
+++ b/Utils/CreatePackage.pl
@@ -1,165 +1,170 @@
-#!/usr/bin/perl
-use strict;
-use warnings;
-
-my $CWD = `pwd`;
-chomp $CWD;
-my $ZIP = "zip";
-if ( -x "$CWD/zip.exe" ) { $ZIP = "$CWD/zip.exe"; }
-	
-if( $#ARGV < 1 )
-{
-	print "Usage: create-zips.pl <game directory> <zip directory>\n";
-	exit 1;
-}
-
-my $in = $ARGV[0];
-my $out = $ARGV[1];
-
-if( ! -d $in )
-{
-	print "$in isn't a directory\n";
-	exit 1;
-}
-if( ! -d $out )
-{
-	print "$out isn't a directory\n";
-	exit 1;
-}
-
-# Resolve $out to an absolute path.
-my $pwd = `pwd`;
-chomp $pwd;
-chdir $out || die "chdir($out): $!";
-$out = `pwd`;
-chomp $out;
-chdir $pwd || die "chdir($pwd): $!";
-
-print "$in -> $out\n";
-
-sub ZipFiles($$@);
-sub ZipFiles($$@)
-{
-	my $dir = shift;
-	my $file = shift;
-	my @files = @{(shift)};
-
-	$dir = $in . "/" . $dir;
-	chdir $dir || die "chdir($dir): $!";
-
-	my @list;
-
-	foreach my $x ( @files )
-	{
-		print "$x\n";
-		# No CVS directories, no dotfiles, files only.
-		my $output = `find "$x" -path '*/CVS' -prune -o -path '*/.*' -prune -o -path '*/*.psd' -prune -o '(' -type f -a -name '*' ')' -print`;
-		if( $? == -1 ) { die "Find failed: $!\n"; }
-		if( $? & 127 ) { die "Find failed with signal %d\n", ($? & 127); }
-		if( $? >> 8 != 0 ) { exit 1; }
-
-		push @list, split(/\n/, $output);
-	}
-
-	# ZIP the files.
-	{
-		my @lst;
-		my %lst_hash;
-		for( my $f = 0; $f <= $#list; ++$f )
-		{
-			push @lst, $list[$f];
-			$lst_hash{$list[$f]} = 1;
-		}
-		
-		# @lst contains the files for zip number $zipno.
-		
-		my $filename = $out . "/$file.smzip";
-		# If the ZIP already exists, get a list of files in it.  Delete any files
-		# that shouldn't be there.
-		if( -e $filename )
-		{
-			my @files = split(/\n/, `unzip -l "$filename"`);
-			shift @files; # "Archive: ..."
-			shift @files; # " Length     Date   Time    Name"
-			shift @files; # "--------    ----   ----    ----"
-			pop @files;   # "--------    ----   ----    -------"
-			pop @files;   # "    2501                   2 files"
-			
-			foreach my $fn ( @files )
-			{
-				# "     1081  02-11-04 19:27   foo" -> "foo"
-				$fn = substr( $fn, 28 );
-			}
-			
-			# Loop over files in the ZIP, and find any files not in %lst_hash.
-			my @unneeded;
-			for( my $n = 0; $n <= $#files; ++$n )
-			{
-				my $file = $files[$n];
-				# Skip directories.
-				if( $file =~ /.*\/$/ ) { next; }
-				if( defined( $lst_hash{$file} ) ) { next; }
-				push @unneeded, $files[$n];
-			}
-
-			if( $#unneeded != -1 )
-			{
-				print "$filename has " . ($#unneeded+1) . " extra files; removing ...\n";
-
-				open TMP, ">/tmp/zip.lst" || die "$!";
-				foreach my $fn ( @unneeded ) { print TMP "$fn\n"; }
-				close TMP;
-
-				system "$ZIP -b $out $filename -d -@ < /tmp/zip.lst";
-				if ($? == -1) { die "Zip failed: $!\n"; }
-				if ($? & 127) { die "Zip failed with signal %d\n", ($? & 127); }
-				if( $? >> 8 != 0 ) { die "Zip failed\n"; }
-			}
-		}
-
-		if( -e $filename ) { print "Updating $filename ...\n"; }
-		else { print "Creating $filename ...\n"; }
-
-		# -q: quiet
-		# -u: update only (only if it already exists)
-		# -y: store links
-		# -n: don't compress
-
-		my $options = "-q -y -n .ogg:.mp3:.png:.jpg:.mpg:.avi";
-		if( -e $filename ) { $options .= " -u"; }
-		open TMP, ">/tmp/zip.lst" || die "$!";
-		foreach my $fn ( @lst ) { print TMP "$fn\n"; }
-		close TMP;
-
-		system "$ZIP $options -b $out $filename -@ < /tmp/zip.lst" || die "Zip failed";
-
-		if ($? == -1) { die "Zip failed: $!\n"; }
-		if ($? & 127) { die "Zip failed with signal %d\n", ($? & 127); }
-		my $ret = ($? >> 8);
-		if( $ret != 0 && $ret != 12 ) { die "Zip failed\n"; }
-	}
-
-	chdir $CWD || die "chdir($CWD): $!";
-}
-
-
-my @files = (
-	"BackgroundEffects",
-	"BackgroundTransitions",
-	"BGAnimations",
-	"Characters/default",
-	"Courses/Default",
-	"Data",
-	"NoteSkins/common/common",
-	"NoteSkins/dance/default",
-	"NoteSkins/dance/delta",
-	"NoteSkins/dance/retro",
-	"NoteSkins/pump/default",
-	"NoteSkins/pump/flat",
-	"Themes/_fallback",
-	"Themes/_portKit-sm4",
-	"Themes/default"
-);
-
-ZipFiles( ".", "GameData", \@files );
-
+#!/usr/bin/perl
+use strict;
+use warnings;
+
+my $CWD = `pwd`;
+chomp $CWD;
+my $ZIP = "zip";
+if ( -x "$CWD/zip.exe" ) { $ZIP = "$CWD/zip.exe"; }
+
+if( $#ARGV < 1 )
+{
+	print "Usage: create-zips.pl <game directory> <zip directory>\n";
+	exit 1;
+}
+
+my $in = $ARGV[0];
+my $out = $ARGV[1];
+
+if( ! -d $in )
+{
+	print "$in isn't a directory\n";
+	exit 1;
+}
+if( ! -d $out )
+{
+	print "$out isn't a directory\n";
+	exit 1;
+}
+
+# Resolve $out to an absolute path.
+my $pwd = `pwd`;
+chomp $pwd;
+chdir $out || die "chdir($out): $!";
+$out = `pwd`;
+chomp $out;
+chdir $pwd || die "chdir($pwd): $!";
+
+print "$in -> $out\n";
+
+sub ZipFiles($$@);
+sub ZipFiles($$@)
+{
+	my $dir = shift;
+	my $file = shift;
+	my @files = @{(shift)};
+
+	$dir = $in . "/" . $dir;
+	chdir $dir || die "chdir($dir): $!";
+
+	my @list;
+
+	foreach my $x ( @files )
+	{
+		print "$x\n";
+		# No CVS directories, no dotfiles, files only.
+		my $output = `find "$x" -path '*/CVS' -prune -o -path '*/.*' -prune -o -path '*/*.psd' -prune -o '(' -type f -a -name '*' ')' -print`;
+		if( $? == -1 ) { die "Find failed: $!\n"; }
+		if( $? & 127 ) { die "Find failed with signal %d\n", ($? & 127); }
+		if( $? >> 8 != 0 ) { exit 1; }
+
+		push @list, split(/\n/, $output);
+	}
+
+	# ZIP the files.
+	{
+		my @lst;
+		my %lst_hash;
+		for( my $f = 0; $f <= $#list; ++$f )
+		{
+			push @lst, $list[$f];
+			$lst_hash{$list[$f]} = 1;
+		}
+
+		# @lst contains the files for zip number $zipno.
+
+		my $filename = $out . "/$file.smzip";
+		# If the ZIP already exists, get a list of files in it.  Delete any files
+		# that shouldn't be there.
+		if( -e $filename )
+		{
+			my @files = split(/\n/, `unzip -l "$filename"`);
+			shift @files; # "Archive: ..."
+			shift @files; # " Length     Date   Time    Name"
+			shift @files; # "--------    ----   ----    ----"
+			pop @files;   # "--------    ----   ----    -------"
+			pop @files;   # "    2501                   2 files"
+
+			foreach my $fn ( @files )
+			{
+				# "     1081  02-11-04 19:27   foo" -> "foo"
+				$fn = substr( $fn, 28 );
+			}
+
+			# Loop over files in the ZIP, and find any files not in %lst_hash.
+			my @unneeded;
+			for( my $n = 0; $n <= $#files; ++$n )
+			{
+				my $file = $files[$n];
+				# Skip directories.
+				if( $file =~ /.*\/$/ ) { next; }
+				if( defined( $lst_hash{$file} ) ) { next; }
+				push @unneeded, $files[$n];
+			}
+
+			if( $#unneeded != -1 )
+			{
+				print "$filename has " . ($#unneeded+1) . " extra files; removing ...\n";
+
+				open TMP, ">/tmp/zip.lst" || die "$!";
+				foreach my $fn ( @unneeded ) { print TMP "$fn\n"; }
+				close TMP;
+
+				system "$ZIP -b $out $filename -d -@ < /tmp/zip.lst";
+				if ($? == -1) { die "Zip failed: $!\n"; }
+				if ($? & 127) { die "Zip failed with signal %d\n", ($? & 127); }
+				if( $? >> 8 != 0 ) { die "Zip failed\n"; }
+			}
+		}
+
+		if( -e $filename ) { print "Updating $filename ...\n"; }
+		else { print "Creating $filename ...\n"; }
+
+		# -q: quiet
+		# -u: update only (only if it already exists)
+		# -y: store links
+		# -n: don't compress
+
+		my $options = "-q -y -n .ogg:.mp3:.png:.jpg:.mpg:.avi";
+		if( -e $filename ) { $options .= " -u"; }
+		open TMP, ">/tmp/zip.lst" || die "$!";
+		foreach my $fn ( @lst ) { print TMP "$fn\n"; }
+		close TMP;
+
+		system "$ZIP $options -b $out $filename -@ < /tmp/zip.lst" || die "Zip failed";
+
+		if ($? == -1) { die "Zip failed: $!\n"; }
+		if ($? & 127) { die "Zip failed with signal %d\n", ($? & 127); }
+		my $ret = ($? >> 8);
+		if( $ret != 0 && $ret != 12 ) { die "Zip failed\n"; }
+	}
+
+	chdir $CWD || die "chdir($CWD): $!";
+}
+
+
+my @files = (
+	"BackgroundEffects",
+	"BackgroundTransitions",
+	"BGAnimations",
+	"Characters/default",
+	"Courses/Default",
+	"Data",
+	"NoteSkins/common/common",
+	"NoteSkins/dance/default",
+	"NoteSkins/dance/Delta",
+	"NoteSkins/dance/midi-note",
+	"NoteSkins/dance/midi-solo",
+	"NoteSkins/dance/midi-vivid",
+	"NoteSkins/dance/midi-routine-p1",
+	"NoteSkins/dance/midi-routine-p2",
+	"NoteSkins/dance/retro",
+	"NoteSkins/pump/default",
+	"NoteSkins/pump/simple",
+	"Themes/_fallback",
+	"Themes/_portKit-sm4",
+	"Themes/default"
+);
+
+ZipFiles( ".", "GameData", \@files );
+
diff --git a/sm-ssc.nsi b/sm-ssc.nsi
index a4748de5e3..03a2d19b60 100644
--- a/sm-ssc.nsi
+++ b/sm-ssc.nsi
@@ -267,7 +267,14 @@ Section "Main Section" SecMain
 	; dance
 	RMDir /r "$INSTDIR\NoteSkins\dance\default"
 	RMDir /r "$INSTDIR\NoteSkins\dance\Delta"
+	; the "midi-*" noteskin series was formerly known as just "midi".
 	RMDir /r "$INSTDIR\NoteSkins\dance\midi"
+	; we may also want to remove the new ones?
+	RMDir /r "$INSTDIR\NoteSkins\dance\midi-note"
+	RMDir /r "$INSTDIR\NoteSkins\dance\midi-solo"
+	RMDir /r "$INSTDIR\NoteSkins\dance\midi-vivid"
+	RMDir /r "$INSTDIR\NoteSkins\dance\midi-rhythm-p1"
+	RMDir /r "$INSTDIR\NoteSkins\dance\midi-rhythm-p2"
 	RMDir /r "$INSTDIR\NoteSkins\dance\retro"
 	; pump
 	RMDir /r "$INSTDIR\NoteSkins\pump\default"
@@ -284,7 +291,12 @@ Section "Main Section" SecMain
 	SetOutPath "$INSTDIR\NoteSkins\dance"
 	File /r /x CVS /x .svn "NoteSkins\dance\default"
 	File /r /x CVS /x .svn "NoteSkins\dance\Delta"
-	File /r /x CVS /x .svn "NoteSkins\dance\midi"
+	; "midi" noteskin was split out after beta 2.
+	File /r /x CVS /x .svn "NoteSkins\dance\midi-note"
+	File /r /x CVS /x .svn "NoteSkins\dance\midi-solo"
+	File /r /x CVS /x .svn "NoteSkins\dance\midi-vivid"
+	File /r /x CVS /x .svn "NoteSkins\dance\midi-rhythm-p1"
+	File /r /x CVS /x .svn "NoteSkins\dance\midi-rhythm-p2"
 	File /r /x CVS /x .svn "NoteSkins\dance\retro"
 	SetOutPath "$INSTDIR"