Fix: Package build
This commit is contained in:
parent
bb9f128540
commit
3286161cd5
@ -219,9 +219,11 @@ if ($nboftargetok) {
|
|||||||
if ($nboftargetneedcvs)
|
if ($nboftargetneedcvs)
|
||||||
{
|
{
|
||||||
print "Go to directory $SOURCE\n";
|
print "Go to directory $SOURCE\n";
|
||||||
|
$olddir=getcwd();
|
||||||
chdir("$SOURCE");
|
chdir("$SOURCE");
|
||||||
print "Run cvs update -P -d\n";
|
print "Run cvs update -P -d\n";
|
||||||
$ret=`cvs update -P -d 2>&1`;
|
$ret=`cvs update -P -d 2>&1`;
|
||||||
|
chdir("$olddir");
|
||||||
}
|
}
|
||||||
|
|
||||||
# Update buildroot if required
|
# Update buildroot if required
|
||||||
@ -302,6 +304,7 @@ if ($nboftargetok) {
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
print "Move $FILENAMETGZ.tgz to $DESTI/$FILENAMETGZ.tgz\n";
|
||||||
$ret=`mv "$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
|
$ret=`mv "$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
|
||||||
}
|
}
|
||||||
next;
|
next;
|
||||||
@ -314,16 +317,23 @@ if ($nboftargetok) {
|
|||||||
print "Compress $FILENAMETGZ into $FILENAMEZIP.zip...\n";
|
print "Compress $FILENAMETGZ into $FILENAMEZIP.zip...\n";
|
||||||
|
|
||||||
print "Go to directory $BUILDROOT\n";
|
print "Go to directory $BUILDROOT\n";
|
||||||
|
$olddir=getcwd();
|
||||||
chdir("$BUILDROOT");
|
chdir("$BUILDROOT");
|
||||||
|
|
||||||
$cmd= "7z a -r -tzip -xr\@\"$BUILDROOT\/$FILENAMETGZ\/build\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*";
|
$cmd= "7z a -r -tzip -xr\@\"$BUILDROOT\/$FILENAMETGZ\/build\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*";
|
||||||
print $cmd."\n";
|
print $cmd."\n";
|
||||||
$ret= `$cmd`;
|
$ret= `$cmd`;
|
||||||
#print $ret;
|
chdir("$olddir");
|
||||||
#print "Go to directory $DESTI\n";
|
|
||||||
#chdir("$DESTI");
|
if ($OS =~ /windows/i)
|
||||||
print "Move $FILENAMEZIP.zip to $DESTI\n";
|
{
|
||||||
rename("$BUILDROOT/$FILENAMEZIP.zip","$DESTI/$FILENAMEZIP.zip");
|
print "Move $FILENAMEZIP.zip to $DESTI/$FILENAMEZIP.zip\n";
|
||||||
|
$ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$DESTI/$FILENAMEZIP.zip"`;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
print "Move $FILENAMEZIP.zip to $DESTI/$FILENAMEZIP.zip\n";
|
||||||
|
$ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$DESTI/$FILENAMEZIP.zip"`;
|
||||||
|
}
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -469,12 +479,25 @@ if ($nboftargetok) {
|
|||||||
$ret=`chmod -R 755 $BUILDROOT/$PROJECT/DEBIAN`;
|
$ret=`chmod -R 755 $BUILDROOT/$PROJECT/DEBIAN`;
|
||||||
|
|
||||||
print "Go to directory $BUILDROOT\n";
|
print "Go to directory $BUILDROOT\n";
|
||||||
|
$olddir=getcwd();
|
||||||
chdir("$BUILDROOT");
|
chdir("$BUILDROOT");
|
||||||
|
|
||||||
$cmd="dpkg -b $BUILDROOT/$PROJECT $BUILDROOT/${FILENAMEDEB}.deb";
|
$cmd="dpkg -b $BUILDROOT/$PROJECT $BUILDROOT/${FILENAMEDEB}.deb";
|
||||||
print "Launch DEB build ($cmd)\n";
|
print "Launch DEB build ($cmd)\n";
|
||||||
$ret=`$cmd`;
|
$ret=`$cmd`;
|
||||||
print $ret."\n";
|
print $ret."\n";
|
||||||
|
chdir("$olddir");
|
||||||
|
|
||||||
|
if ($OS =~ /windows/i)
|
||||||
|
{
|
||||||
|
print "Move ${FILENAMEDEB}.deb to $BUILDROOT/${FILENAMEDEB}.deb\n";
|
||||||
|
$ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
print "Move ${FILENAMEDEB}.deb to $BUILDROOT/${FILENAMEDEB}.deb\n";
|
||||||
|
$ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`;
|
||||||
|
}
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user