Commit eb72cf66 authored by unknown's avatar unknown
Browse files

Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0 

into mysql.com:/space/my/mysql-4.0
parents fd15d5ae a53fc49e

Build-tools/Do-pkg

+11 −2
Original line number Diff line number Diff line
@@ -61,6 +61,12 @@ else 
}



$PM= "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker";

# Try another location on 10.3.3

unless (-e "$PM")

{

	$PM= "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker";

}



$TMP= $ENV{TMPDIR};

$TMP eq "" ?  $TMP= $TMP . "/PKGBUILD.$$": $TMP= "/tmp/PKGBUILD.$$";

$PKGROOT= "$TMP/PMROOT";
@@ -79,6 +85,9 @@ $BUILDDIR= "$PWD/$HOST"; 
$SRCBASEDIR= <$BUILDDIR/mysql*-$VERSION>;

$SUPFILEDIR= <$SRCBASEDIR/support-files/MacOSX>;

$TAR= <$BUILDDIR/$NAME-apple-darwin*-powerpc.tar.gz>;

$TAR =~ /.*\/$NAME(.*)\.tar\.gz$/;

$ARCH= $1;

$NAME= $NAME . $ARCH;

$INFO= <$SUPFILEDIR/Info.plist>;

$DESC= <$SUPFILEDIR/Description.plist>;

$SI_INFO= <$SUPFILEDIR/StartupItem.Info.plist>;
@@ -167,7 +176,7 @@ unless (-f "$RESOURCE_DIR/License.txt"); 
&logger("Extracting $TAR to $PKGROOT");

&run_command("gnutar zxf $TAR -C $PKGROOT", "Unable to extract $TAR!");

&run_command("cd $PKGROOT ; ln -s mysql* ./mysql", "Unable to create symlink!");

&run_command("chown -R root.wheel $PKGROOT/*", "Cannot chown $PKGROOT!");

&run_command("chown -R root:wheel $PKGROOT/*", "Cannot chown $PKGROOT!");



# Now build the PGK using PackageMaker

# The "|| true" is a nasty hack to work around a problem with Package Maker
@@ -196,7 +205,7 @@ unless ($opt_skip_si) 
		copy("$SI_PARAMS", "$PKGROOT/MySQL/")

			or &abort("Error copying $SI_PARAMS!");

		chmod(0644, "$PKGROOT/MySQL/" . basename("$SI_PARAMS"));

		&run_command("chown -R root.wheel $PKGROOT/*", "Cannot chown $PKGROOT!");

		&run_command("chown -R root:wheel $PKGROOT/*", "Cannot chown $PKGROOT!");

		copy("$SI_POST", "$RESOURCE_DIR/postinstall")

			or &abort("Error copying $SI_POST!");

		chmod(0644, "$RESOURCE_DIR/postinstall");