Skip to content
Snippets Groups Projects
Commit cd5f04ef authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Packager can now build different packages into one launch.

parent 490d5cef
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
build/makepack-dolibarr.pl
+ 14
− 9
View file @ cd5f04ef
...@@ -276,8 +276,9 @@ if ($nboftargetok) { ...@@ -276,8 +276,9 @@ if ($nboftargetok) {
print "Remove target $FILENAMESNAPSHOT.tgz...\n"; print "Remove target $FILENAMESNAPSHOT.tgz...\n";
unlink("$DESTI/$FILENAMESNAPSHOT.tgz"); unlink("$DESTI/$FILENAMESNAPSHOT.tgz");
mkdir "$BUILDROOT/$FILENAMESNAPSHOT" or die $!; #rmdir "$BUILDROOT/$FILENAMESNAPSHOT";
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMESNAPSHOT\n"; $ret=`rm -fr $BUILDROOT/$FILENAMESNAPSHOT`;
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMESNAPSHOT\n";
$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMESNAPSHOT\""; $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMESNAPSHOT\"";
$ret=`$cmd`; $ret=`$cmd`;
...@@ -303,8 +304,9 @@ if ($nboftargetok) { ...@@ -303,8 +304,9 @@ if ($nboftargetok) {
print "Remove target $FILENAMETGZ.tgz...\n"; print "Remove target $FILENAMETGZ.tgz...\n";
unlink("$DESTI/$FILENAMETGZ.tgz"); unlink("$DESTI/$FILENAMETGZ.tgz");
rmdir "$BUILDROOT/$FILENAMETGZ"; #rmdir "$BUILDROOT/$FILENAMETGZ";
print "Copy $BUILDROOT/$PROJECT/ to $BUILDROOT/$FILENAMETGZ\n"; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ`;
print "Copy $BUILDROOT/$PROJECT/ to $BUILDROOT/$FILENAMETGZ\n";
$cmd="cp -pr \"$BUILDROOT/$PROJECT/\" \"$BUILDROOT/$FILENAMETGZ\""; $cmd="cp -pr \"$BUILDROOT/$PROJECT/\" \"$BUILDROOT/$FILENAMETGZ\"";
$ret=`$cmd`; $ret=`$cmd`;
...@@ -328,8 +330,9 @@ if ($nboftargetok) { ...@@ -328,8 +330,9 @@ if ($nboftargetok) {
print "Remove target $FILENAMEZIP.zip...\n"; print "Remove target $FILENAMEZIP.zip...\n";
unlink("$DESTI/$FILENAMEZIP.zip"); unlink("$DESTI/$FILENAMEZIP.zip");
rmdir "$BUILDROOT/$FILENAMEZIP"; #rmdir "$BUILDROOT/$FILENAMEZIP";
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEZIP\n"; $ret=`rm -fr $BUILDROOT/$FILENAMEZIP`;
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEZIP\n";
$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEZIP\""; $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEZIP\"";
$ret=`$cmd`; $ret=`$cmd`;
...@@ -372,8 +375,9 @@ if ($nboftargetok) { ...@@ -372,8 +375,9 @@ if ($nboftargetok) {
print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm...\n"; print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm...\n";
unlink("$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm"); unlink("$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm");
rmdir "$BUILDROOT/$FILENAMETGZ2"; #rmdir "$BUILDROOT/$FILENAMETGZ2";
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n"; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`;
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n";
$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\""; $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\"";
$ret=`$cmd`; $ret=`$cmd`;
...@@ -414,7 +418,8 @@ if ($nboftargetok) { ...@@ -414,7 +418,8 @@ if ($nboftargetok) {
print "Remove target $FILENAMEDEB.deb...\n"; print "Remove target $FILENAMEDEB.deb...\n";
unlink("$DESTI/$FILENAMEDEB.deb"); unlink("$DESTI/$FILENAMEDEB.deb");
rmdir "$BUILDROOT/$PROJECT.tmp"; #rmdir "$BUILDROOT/$PROJECT.tmp";
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share\n"; print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share\n";
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`;
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n"; print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n";
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment