diff --git a/Utils/build-and-package.pl b/Utils/build-and-package.pl index 16f0218a13f..73f69da9496 100755 --- a/Utils/build-and-package.pl +++ b/Utils/build-and-package.pl @@ -12,17 +12,14 @@ print "Start compiling...\n"; chdir(".."); system("mvn clean install -DskipTests"); chdir("Mage.Client"); -system("mvn assembly:assembly"); +system("mvn package assembly:single"); chdir("../Mage.Server"); -system("mvn assembly:assembly"); +system("mvn package assembly:single"); chdir(".."); mkdir("temp"); chdir("temp"); move("../Mage.Client/target/mage-client.zip", "client.zip"); move("../Mage.Server/target/mage-server.zip", "server.zip"); -copy("../Utils/release/startMage.bat", "startMage.bat"); -copy("../Utils/release/startMageWin7.bat", "startMageWin7.bat"); -copy("../Utils/release/startMage.sh", "startMage.sh"); my $f = Archive::Extract->new( archive => "client.zip"); $f->extract( to => "client/"); @@ -34,9 +31,6 @@ unlink("server.zip"); my $zip = Archive::Zip->new();; $zip->addTree("client", "mage-client"); $zip->addTree("server", "mage-server"); -$zip->addFile("startMage.bat"); -$zip->addFile("startMageWin7.bat"); -$zip->addFile("startMage.sh"); $zip->writeToFileNamed("../mage-bundle.zip"); chdir("..");