Fix: Packager errors
This commit is contained in:
Laurent Destailleur
parent
86d8385d95
commit
12a247e600
@ -11,8 +11,8 @@ use Cwd;
|
|||||||
$PROJECT="dolibarr";
|
$PROJECT="dolibarr";
|
||||||
$MAJOR="3";
|
$MAJOR="3";
|
||||||
$MINOR="1";
|
$MINOR="1";
|
||||||
$BUILD="0-dev"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
|
$BUILD="0-dev"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
|
||||||
$RPMSUBVERSION="1"; # A incrementer au moment de la release
|
$RPMSUBVERSION="1"; # A incrementer au moment de la release
|
||||||
|
|
||||||
@LISTETARGET=("TGZ","ZIP","RPM","DEB","EXE","EXEDOLIWAMP","SNAPSHOT"); # Possible packages
|
@LISTETARGET=("TGZ","ZIP","RPM","DEB","EXE","EXEDOLIWAMP","SNAPSHOT"); # Possible packages
|
||||||
%REQUIREMENTTARGET=( # Tool requirement for each package
|
%REQUIREMENTTARGET=( # Tool requirement for each package
|
||||||
@ -70,10 +70,10 @@ elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
|
|||||||
elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
|
elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
|
||||||
if (! $OS) {
|
if (! $OS) {
|
||||||
print "$PROG.$Extension was not able to detect your OS.\n";
|
print "$PROG.$Extension was not able to detect your OS.\n";
|
||||||
print "Can't continue.\n";
|
print "Can't continue.\n";
|
||||||
print "$PROG.$Extension aborted.\n";
|
print "$PROG.$Extension aborted.\n";
|
||||||
sleep 2;
|
sleep 2;
|
||||||
exit 1;
|
exit 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Define buildroot
|
# Define buildroot
|
||||||
@ -91,7 +91,7 @@ if ($OS =~ /windows/) {
|
|||||||
if (! $TEMP || ! -d $TEMP) {
|
if (! $TEMP || ! -d $TEMP) {
|
||||||
print "Error: A temporary directory can not be find.\n";
|
print "Error: A temporary directory can not be find.\n";
|
||||||
print "Check that TEMP or TMP environment variable is set correctly.\n";
|
print "Check that TEMP or TMP environment variable is set correctly.\n";
|
||||||
print "$PROG.$Extension aborted.\n";
|
print "$PROG.$Extension aborted.\n";
|
||||||
sleep 2;
|
sleep 2;
|
||||||
exit 2;
|
exit 2;
|
||||||
}
|
}
|
||||||
@ -102,11 +102,11 @@ my $copyalreadydone=0;
|
|||||||
my $batch=0;
|
my $batch=0;
|
||||||
|
|
||||||
for (0..@ARGV-1) {
|
for (0..@ARGV-1) {
|
||||||
if ($ARGV[$_] =~ /^-*target=(\w+)/i) { $target=$1; $batch=1; }
|
if ($ARGV[$_] =~ /^-*target=(\w+)/i) { $target=$1; $batch=1; }
|
||||||
if ($ARGV[$_] =~ /^-*desti=(.+)/i) { $DESTI=$1; }
|
if ($ARGV[$_] =~ /^-*desti=(.+)/i) { $DESTI=$1; }
|
||||||
if ($ARGV[$_] =~ /^-*prefix=(.+)/i) {
|
if ($ARGV[$_] =~ /^-*prefix=(.+)/i) {
|
||||||
$PREFIX=$1;
|
$PREFIX=$1;
|
||||||
$FILENAMESNAPSHOT.="-".$PREFIX;
|
$FILENAMESNAPSHOT.="-".$PREFIX;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -127,40 +127,40 @@ else {
|
|||||||
my $found=0;
|
my $found=0;
|
||||||
my $NUM_SCRIPT;
|
my $NUM_SCRIPT;
|
||||||
while (! $found) {
|
while (! $found) {
|
||||||
my $cpt=0;
|
my $cpt=0;
|
||||||
printf(" %d - %3s (%s)\n",$cpt,"All","Need ".join(",",values %REQUIREMENTTARGET));
|
printf(" %d - %3s (%s)\n",$cpt,"All","Need ".join(",",values %REQUIREMENTTARGET));
|
||||||
foreach my $target (@LISTETARGET) {
|
foreach my $target (@LISTETARGET) {
|
||||||
$cpt++;
|
$cpt++;
|
||||||
printf(" %d - %3s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
|
printf(" %d - %3s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
|
||||||
}
|
}
|
||||||
|
|
||||||
# On demande de choisir le fichier à passer
|
# On demande de choisir le fichier à passer
|
||||||
print "Choose one package number or several separated with space: ";
|
print "Choose one package number or several separated with space: ";
|
||||||
$NUM_SCRIPT=<STDIN>;
|
$NUM_SCRIPT=<STDIN>;
|
||||||
chomp($NUM_SCRIPT);
|
chomp($NUM_SCRIPT);
|
||||||
if ($NUM_SCRIPT =~ s/-//g) {
|
if ($NUM_SCRIPT =~ s/-//g) {
|
||||||
# Do not do copy
|
# Do not do copy
|
||||||
$copyalreadydone=1;
|
$copyalreadydone=1;
|
||||||
}
|
}
|
||||||
if ($NUM_SCRIPT !~ /^[0-$cpt\s]+$/)
|
if ($NUM_SCRIPT !~ /^[0-$cpt\s]+$/)
|
||||||
{
|
{
|
||||||
print "This is not a valid package number list.\n";
|
print "This is not a valid package number list.\n";
|
||||||
$found = 0;
|
$found = 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$found = 1;
|
$found = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
print "\n";
|
print "\n";
|
||||||
if ($NUM_SCRIPT) {
|
if ($NUM_SCRIPT) {
|
||||||
foreach my $num (split(/\s+/,$NUM_SCRIPT)) {
|
foreach my $num (split(/\s+/,$NUM_SCRIPT)) {
|
||||||
$CHOOSEDTARGET{$LISTETARGET[$num-1]}=1;
|
$CHOOSEDTARGET{$LISTETARGET[$num-1]}=1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
foreach my $key (@LISTETARGET) {
|
foreach my $key (@LISTETARGET) {
|
||||||
$CHOOSEDTARGET{$key}=1;
|
$CHOOSEDTARGET{$key}=1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -201,15 +201,15 @@ $nboftargetneedbuildroot=0;
|
|||||||
$nboftargetneedcvs=0;
|
$nboftargetneedcvs=0;
|
||||||
foreach my $target (keys %CHOOSEDTARGET) {
|
foreach my $target (keys %CHOOSEDTARGET) {
|
||||||
if ($CHOOSEDTARGET{$target} < 0) { next; }
|
if ($CHOOSEDTARGET{$target} < 0) { next; }
|
||||||
if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP')
|
if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP')
|
||||||
{
|
{
|
||||||
$nboftargetneedbuildroot++;
|
$nboftargetneedbuildroot++;
|
||||||
}
|
}
|
||||||
if ($target eq 'SNAPSHOT')
|
if ($target eq 'SNAPSHOT')
|
||||||
{
|
{
|
||||||
$nboftargetneedcvs++;
|
$nboftargetneedcvs++;
|
||||||
}
|
}
|
||||||
$nboftargetok++;
|
$nboftargetok++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($nboftargetok) {
|
if ($nboftargetok) {
|
||||||
@ -217,47 +217,47 @@ if ($nboftargetok) {
|
|||||||
# Update CVS if required
|
# Update CVS if required
|
||||||
#-----------------------
|
#-----------------------
|
||||||
if ($nboftargetneedcvs)
|
if ($nboftargetneedcvs)
|
||||||
{
|
{
|
||||||
print "Go to directory $SOURCE\n";
|
print "Go to directory $SOURCE\n";
|
||||||
$olddir=getcwd();
|
$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");
|
chdir("$olddir");
|
||||||
}
|
}
|
||||||
|
|
||||||
# Update buildroot if required
|
# Update buildroot if required
|
||||||
#-----------------------------
|
#-----------------------------
|
||||||
if ($nboftargetneedbuildroot)
|
if ($nboftargetneedbuildroot)
|
||||||
{
|
{
|
||||||
if (! $copyalreadydone) {
|
if (! $copyalreadydone) {
|
||||||
print "Delete directory $BUILDROOT\n";
|
print "Delete directory $BUILDROOT\n";
|
||||||
$ret=`rm -fr "$BUILDROOT"`;
|
$ret=`rm -fr "$BUILDROOT"`;
|
||||||
|
|
||||||
mkdir "$BUILDROOT";
|
mkdir "$BUILDROOT";
|
||||||
mkdir "$BUILDROOT/dolibarr";
|
mkdir "$BUILDROOT/$PROJECT";
|
||||||
print "Copy $SOURCE into $BUILDROOT/dolibarr\n";
|
print "Copy $SOURCE into $BUILDROOT/$PROJECT\n";
|
||||||
$ret=`cp -pr "$SOURCE" "$BUILDROOT/dolibarr"`;
|
$ret=`cp -pr "$SOURCE" "$BUILDROOT/$PROJECT"`;
|
||||||
}
|
}
|
||||||
print "Clean $BUILDROOT\n";
|
print "Clean $BUILDROOT\n";
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/index.php`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/index.php`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/document`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/document`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/test`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/test`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS*`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS*`;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Build package for each target
|
# Build package for each target
|
||||||
#------------------------------
|
#------------------------------
|
||||||
@ -266,64 +266,64 @@ if ($nboftargetok) {
|
|||||||
|
|
||||||
print "\nBuild package for target $target\n";
|
print "\nBuild package for target $target\n";
|
||||||
|
|
||||||
if ($target eq 'SNAPSHOT') {
|
if ($target eq 'SNAPSHOT') {
|
||||||
print "Rename $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMESNAPSHOT\n";
|
print "Rename $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMESNAPSHOT\n";
|
||||||
rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMESNAPSHOT");
|
rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMESNAPSHOT");
|
||||||
unlink("$FILENAMESNAPSHOT.tgz");
|
unlink("$DESTI/$FILENAMESNAPSHOT.tgz");
|
||||||
|
|
||||||
print "Compress $BUILDROOT into $FILENAMESNAPSHOT.tgz...\n";
|
print "Compress $BUILDROOT into $FILENAMESNAPSHOT.tgz...\n";
|
||||||
#$cmd="tar --exclude \"$BUILDROOT/tgz/tar_exclude.txt\" --exclude .cache --exclude .settings --exclude conf.php --directory \"$BUILDROOT\" -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT";
|
#$cmd="tar --exclude \"$BUILDROOT/tgz/tar_exclude.txt\" --exclude .cache --exclude .settings --exclude conf.php --directory \"$BUILDROOT\" -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT";
|
||||||
$cmd="tar --exclude doli*.tgz --exclude doli*.deb --exclude doli*.exe --exclude doli*.zip --exclude doli*.rpm --exclude .cache --exclude .settings --exclude conf.php --exclude conf.php.mysql --exclude conf.php.old --exclude conf.php.postgres --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT";
|
$cmd="tar --exclude doli*.tgz --exclude doli*.deb --exclude doli*.exe --exclude doli*.zip --exclude doli*.rpm --exclude .cache --exclude .settings --exclude conf.php --exclude conf.php.mysql --exclude conf.php.old --exclude conf.php.postgres --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT";
|
||||||
print $cmd."\n";
|
print $cmd."\n";
|
||||||
$ret=`$cmd`;
|
$ret=`$cmd`;
|
||||||
if ($OS =~ /windows/i)
|
if ($OS =~ /windows/i)
|
||||||
{
|
{
|
||||||
print "Move $FILENAMESNAPSHOT.tgz to $DESTI/$FILENAMESNAPSHOT.tgz\n";
|
print "Move $FILENAMESNAPSHOT.tgz to $DESTI/$FILENAMESNAPSHOT.tgz\n";
|
||||||
$ret=`mv "$FILENAMESNAPSHOT.tgz" "$DESTI/$FILENAMESNAPSHOT.tgz"`;
|
$ret=`mv "$FILENAMESNAPSHOT.tgz" "$DESTI/$FILENAMESNAPSHOT.tgz"`;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print "Move $FILENAMESNAPSHOT.tgz to $DESTI/$FILENAMESNAPSHOT.tgz\n";
|
print "Move $FILENAMESNAPSHOT.tgz to $DESTI/$FILENAMESNAPSHOT.tgz\n";
|
||||||
$ret=`mv "$FILENAMESNAPSHOT.tgz" "$DESTI/$FILENAMESNAPSHOT.tgz"`;
|
$ret=`mv "$FILENAMESNAPSHOT.tgz" "$DESTI/$FILENAMESNAPSHOT.tgz"`;
|
||||||
}
|
}
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($target eq 'TGZ') {
|
if ($target eq 'TGZ') {
|
||||||
print "Rename $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ\n";
|
print "Rename $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ\n";
|
||||||
rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMETGZ");
|
rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMETGZ");
|
||||||
print "Remove target $FILENAMETGZ.tgz...\n";
|
print "Remove target $FILENAMETGZ.tgz...\n";
|
||||||
unlink("$FILENAMETGZ.tgz");
|
unlink("$FILENAMETGZ.tgz");
|
||||||
print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
|
print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
|
||||||
$cmd="tar --exclude-vcs --exclude-from \"$DESTI/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" $FILENAMETGZ";
|
$cmd="tar --exclude-vcs --exclude-from \"$DESTI/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" $FILENAMETGZ";
|
||||||
$ret=`$cmd`;
|
$ret=`$cmd`;
|
||||||
if ($OS =~ /windows/i)
|
if ($OS =~ /windows/i)
|
||||||
{
|
{
|
||||||
print "Move $FILENAMETGZ.tgz to $DESTI/$FILENAMETGZ.tgz\n";
|
print "Move $FILENAMETGZ.tgz to $DESTI/$FILENAMETGZ.tgz\n";
|
||||||
$ret=`mv "$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
|
$ret=`mv "$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print "Move $FILENAMETGZ.tgz to $DESTI/$FILENAMETGZ.tgz\n";
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($target eq 'ZIP') {
|
if ($target eq 'ZIP') {
|
||||||
print "Rename $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEZIP\n";
|
print "Rename $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEZIP\n";
|
||||||
rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMEZIP");
|
rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMEZIP");
|
||||||
unlink("$FILENAMEZIP.zip");
|
unlink("$DESTI/$FILENAMEZIP.zip");
|
||||||
print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
|
print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
|
||||||
|
|
||||||
print "Go to directory $BUILDROOT\n";
|
print "Go to directory $BUILDROOT\n";
|
||||||
$olddir=getcwd();
|
$olddir=getcwd();
|
||||||
chdir("$BUILDROOT");
|
chdir("$BUILDROOT");
|
||||||
$cmd= "7z a -r -tzip -xr\@\"$BUILDROOT\/$FILENAMEZIP\/build\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMEZIP\\*";
|
$cmd= "7z a -r -tzip -xr\@\"$BUILDROOT\/$FILENAMEZIP\/build\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMEZIP\\*";
|
||||||
print $cmd."\n";
|
print $cmd."\n";
|
||||||
$ret= `$cmd`;
|
$ret= `$cmd`;
|
||||||
chdir("$olddir");
|
chdir("$olddir");
|
||||||
|
|
||||||
if ($OS =~ /windows/i)
|
if ($OS =~ /windows/i)
|
||||||
{
|
{
|
||||||
print "Move $FILENAMEZIP.zip to $DESTI/$FILENAMEZIP.zip\n";
|
print "Move $FILENAMEZIP.zip to $DESTI/$FILENAMEZIP.zip\n";
|
||||||
@ -334,25 +334,25 @@ if ($nboftargetok) {
|
|||||||
print "Move $FILENAMEZIP.zip to $DESTI/$FILENAMEZIP.zip\n";
|
print "Move $FILENAMEZIP.zip to $DESTI/$FILENAMEZIP.zip\n";
|
||||||
$ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$DESTI/$FILENAMEZIP.zip"`;
|
$ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$DESTI/$FILENAMEZIP.zip"`;
|
||||||
}
|
}
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($target eq 'RPM') { # Linux only
|
if ($target eq 'RPM') { # Linux only
|
||||||
print "RPM build is not yet available\n";
|
print "RPM build is not yet available\n";
|
||||||
return;
|
return;
|
||||||
|
|
||||||
print "Rename $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ\n";
|
print "Rename $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ\n";
|
||||||
rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMETGZ");
|
rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMETGZ");
|
||||||
unlink("$FILENAMETGZ.tgz");
|
unlink("$DESTI/$FILENAMETGZ.tgz");
|
||||||
print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
|
print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
|
||||||
$ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ.tgz" $FILENAMETGZ`;
|
$ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ.tgz" $FILENAMETGZ`;
|
||||||
|
|
||||||
print "Move $FILENAMETGZ.tgz to $RPMDIR/SOURCES/$FILENAMETGZ.tgz\n";
|
print "Move $FILENAMETGZ.tgz to $RPMDIR/SOURCES/$FILENAMETGZ.tgz\n";
|
||||||
$cmd="mv \"$BUILDROOT/$FILENAMETGZ.tgz\" \"$RPMDIR/SOURCES/$FILENAMETGZ.tgz\"";
|
$cmd="mv \"$BUILDROOT/$FILENAMETGZ.tgz\" \"$RPMDIR/SOURCES/$FILENAMETGZ.tgz\"";
|
||||||
$ret=`$cmd`;
|
$ret=`$cmd`;
|
||||||
|
|
||||||
$BUILDFIC="$FILENAME.spec";
|
$BUILDFIC="$FILENAME.spec";
|
||||||
print "Generate file $BUILDROOT/$BUILDFIC\n";
|
print "Generate file $BUILDROOT/$BUILDFIC\n";
|
||||||
open (SPECFROM,"<$SOURCE/build/rpm/${BUILDFIC}") || die "Error";
|
open (SPECFROM,"<$SOURCE/build/rpm/${BUILDFIC}") || die "Error";
|
||||||
open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error";
|
open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error";
|
||||||
while (<SPECFROM>) {
|
while (<SPECFROM>) {
|
||||||
@ -362,132 +362,133 @@ if ($nboftargetok) {
|
|||||||
close SPECFROM;
|
close SPECFROM;
|
||||||
close SPECTO;
|
close SPECTO;
|
||||||
|
|
||||||
print "Launch RPM build (rpm --clean -ba $BUILDROOT/${BUILDFIC})\n";
|
print "Launch RPM build (rpm --clean -ba $BUILDROOT/${BUILDFIC})\n";
|
||||||
$ret=`rpm --clean -ba $BUILDROOT/${BUILDFIC}`;
|
$ret=`rpm --clean -ba $BUILDROOT/${BUILDFIC}`;
|
||||||
|
|
||||||
print "Move $RPMDIR/RPMS/noarch/${FILENAMERPM}.noarch.rpm into $DESTI/${FILENAMERPM}.noarch.rpm\n";
|
print "Move $RPMDIR/RPMS/noarch/${FILENAMERPM}.noarch.rpm into $DESTI/${FILENAMERPM}.noarch.rpm\n";
|
||||||
$cmd="mv \"$RPMDIR/RPMS/noarch/${FILENAMERPM}.noarch.rpm\" \"$DESTI/${FILENAMERPM}.noarch.rpm\"";
|
$cmd="mv \"$RPMDIR/RPMS/noarch/${FILENAMERPM}.noarch.rpm\" \"$DESTI/${FILENAMERPM}.noarch.rpm\"";
|
||||||
$ret=`$cmd`;
|
$ret=`$cmd`;
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($target eq 'DEB') {
|
if ($target eq 'DEB') {
|
||||||
|
unlink("$DESTI/$FILENAMEDEB.deb");
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
|
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
|
||||||
|
|
||||||
print "Move $BUILDROOT/$PROJECT $BUILDROOT/$PROJECT.tmp\n";
|
print "Move $BUILDROOT/$PROJECT $BUILDROOT/$PROJECT.tmp\n";
|
||||||
$cmd="mv \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\"";
|
$cmd="mv \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\"";
|
||||||
$ret=`$cmd`;
|
$ret=`$cmd`;
|
||||||
|
|
||||||
print "Create directory $BUILDROOT/$PROJECT/usr/share\n";
|
print "Create directory $BUILDROOT/$PROJECT/usr/share\n";
|
||||||
$ret=`mkdir -p "$BUILDROOT/$PROJECT/usr/share"`;
|
$ret=`mkdir -p "$BUILDROOT/$PROJECT/usr/share"`;
|
||||||
|
|
||||||
print "Move $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT/usr/share/$PROJECT\n";
|
print "Move $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT/usr/share/$PROJECT\n";
|
||||||
$cmd="mv \"$BUILDROOT/$PROJECT.tmp\" \"$BUILDROOT/$PROJECT/usr/share/$PROJECT\"";
|
$cmd="mv \"$BUILDROOT/$PROJECT.tmp\" \"$BUILDROOT/$PROJECT/usr/share/$PROJECT\"";
|
||||||
$ret=`$cmd`;
|
$ret=`$cmd`;
|
||||||
|
|
||||||
print "Create directory $BUILDROOT/$PROJECT/DEBIAN\n";
|
print "Create directory $BUILDROOT/$PROJECT/DEBIAN\n";
|
||||||
$ret=`mkdir "$BUILDROOT/$PROJECT/DEBIAN"`;
|
$ret=`mkdir "$BUILDROOT/$PROJECT/DEBIAN"`;
|
||||||
print "Copy $SOURCE/build/deb/* to $BUILDROOT/$PROJECT/DEBIAN\n";
|
print "Copy $SOURCE/build/deb/* to $BUILDROOT/$PROJECT/DEBIAN\n";
|
||||||
$ret=`cp -r "$SOURCE/build/deb/." "$BUILDROOT/$PROJECT/DEBIAN"`;
|
$ret=`cp -r "$SOURCE/build/deb/." "$BUILDROOT/$PROJECT/DEBIAN"`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/DEBIAN/CVS`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/DEBIAN/CVS`;
|
||||||
|
|
||||||
print "Remove config file\n";
|
print "Remove config file\n";
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/htdocs/conf/conf.php`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/htdocs/conf/conf.php`;
|
||||||
|
|
||||||
print "Remove other files\n";
|
print "Remove other files\n";
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/build/DoliWamp-*`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/build/DoliWamp-*`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/build/DoliMamp-*`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/build/DoliMamp-*`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/build/dolibarr-*.tar`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/build/dolibarr-*.tar`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/build/dolibarr-*.tgz`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/build/dolibarr-*.tgz`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/build/dolibarr-*.zip`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/build/dolibarr-*.zip`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/build/dolibarr-*.deb`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/build/dolibarr-*.deb`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/build/doxygen/doxygen_warnings.log`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/build/doxygen/doxygen_warnings.log`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/build/html`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/build/html`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/dbmodel`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/dbmodel`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/fpdf`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/fpdf`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/initdata`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/initdata`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/iso-normes`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/iso-normes`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/phpcheckstyle`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/phpcheckstyle`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/phpunit`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/phpunit`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/spec`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/spec`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/uml`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/uml`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/xdebug`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/xdebug`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/doc/flyer`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/doc/flyer`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/doc/font`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/doc/font`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/doc/tshirt`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/doc/tshirt`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/doc/rollup`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/doc/rollup`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/htdocs/conf/conf.php.mysql`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/htdocs/conf/conf.php.mysql`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/htdocs/conf/conf.php.old`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/htdocs/conf/conf.php.old`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/htdocs/conf/conf.php.postgres`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/htdocs/conf/conf.php.postgres`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/htdocs/conf/conf*sav*`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/htdocs/conf/conf*sav*`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/test`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/test`;
|
||||||
# To remove once stable
|
# To remove once stable
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/htdocs/incluces/modules/facture/doc/doc_generic_invoice_odt.modules.php`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/htdocs/incluces/modules/facture/doc/doc_generic_invoice_odt.modules.php`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
|
||||||
|
|
||||||
print "Edit version in file $BUILDROOT/$PROJECT/DEBIAN/control\n";
|
print "Edit version in file $BUILDROOT/$PROJECT/DEBIAN/control\n";
|
||||||
open (SPECFROM,"<$SOURCE/build/deb/control") || die "Error";
|
open (SPECFROM,"<$SOURCE/build/deb/control") || die "Error";
|
||||||
open (SPECTO,">$BUILDROOT/$PROJECT/DEBIAN/control") || die "Error";
|
open (SPECTO,">$BUILDROOT/$PROJECT/DEBIAN/control") || die "Error";
|
||||||
while (<SPECFROM>) {
|
while (<SPECFROM>) {
|
||||||
$newbuild = $BUILD;
|
$newbuild = $BUILD;
|
||||||
$newbuild =~ s/(dev|alpha)/0/gi; # dev
|
$newbuild =~ s/(dev|alpha)/0/gi; # dev
|
||||||
$newbuild =~ s/beta/1/gi; # beta
|
$newbuild =~ s/beta/1/gi; # beta
|
||||||
$newbuild =~ s/rc./2/gi; # rc
|
$newbuild =~ s/rc./2/gi; # rc
|
||||||
if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale
|
if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale
|
||||||
$_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/;
|
$_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/;
|
||||||
print SPECTO $_;
|
print SPECTO $_;
|
||||||
}
|
}
|
||||||
close SPECFROM;
|
close SPECFROM;
|
||||||
close SPECTO;
|
close SPECTO;
|
||||||
print "Version set to $MAJOR.$MINOR.$newbuild\n";
|
print "Version set to $MAJOR.$MINOR.$newbuild\n";
|
||||||
|
|
||||||
print "Create directory $BUILDROOT/$PROJECT/usr/share/applications\n";
|
print "Create directory $BUILDROOT/$PROJECT/usr/share/applications\n";
|
||||||
$ret=`mkdir -p "$BUILDROOT/$PROJECT/usr/share/applications"`;
|
$ret=`mkdir -p "$BUILDROOT/$PROJECT/usr/share/applications"`;
|
||||||
print "Copy desktop file into $BUILDROOT/$PROJECT/usr/share/applications/dolibarr.desktop\n";
|
print "Copy desktop file into $BUILDROOT/$PROJECT/usr/share/applications/dolibarr.desktop\n";
|
||||||
$ret=`cp "$SOURCE/build/deb/dolibarr.desktop" "$BUILDROOT/$PROJECT/usr/share/applications/dolibarr.desktop"`;
|
$ret=`cp "$SOURCE/build/deb/dolibarr.desktop" "$BUILDROOT/$PROJECT/usr/share/applications/dolibarr.desktop"`;
|
||||||
|
|
||||||
print "Create directory $BUILDROOT/$PROJECT/usr/share/pixmaps\n";
|
print "Create directory $BUILDROOT/$PROJECT/usr/share/pixmaps\n";
|
||||||
$ret=`mkdir -p "$BUILDROOT/$PROJECT/usr/share/pixmaps"`;
|
$ret=`mkdir -p "$BUILDROOT/$PROJECT/usr/share/pixmaps"`;
|
||||||
print "Copy pixmap file into $BUILDROOT/$PROJECT/usr/share/pixmaps/dolibarr.xpm\n";
|
print "Copy pixmap file into $BUILDROOT/$PROJECT/usr/share/pixmaps/dolibarr.xpm\n";
|
||||||
$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$PROJECT/usr/share/pixmaps/dolibarr.xpm"`;
|
$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$PROJECT/usr/share/pixmaps/dolibarr.xpm"`;
|
||||||
|
|
||||||
#print "Create directory $BUILDROOT/$PROJECT/etc/$PROJECT\n";
|
#print "Create directory $BUILDROOT/$PROJECT/etc/$PROJECT\n";
|
||||||
#$ret=`mkdir -p "$BUILDROOT/$PROJECT/etc/$PROJECT"`;
|
#$ret=`mkdir -p "$BUILDROOT/$PROJECT/etc/$PROJECT"`;
|
||||||
|
|
||||||
#print "Copy changelog file into $BUILDROOT/$PROJECT/DEBIAN\n";
|
#print "Copy changelog file into $BUILDROOT/$PROJECT/DEBIAN\n";
|
||||||
#$ret=`cp "$SOURCE/ChangeLog" "$BUILDROOT/$PROJECT/DEBIAN/changelog"`;
|
#$ret=`cp "$SOURCE/ChangeLog" "$BUILDROOT/$PROJECT/DEBIAN/changelog"`;
|
||||||
|
|
||||||
print "Copy README file into $BUILDROOT/$PROJECT/DEBIAN\n";
|
print "Copy README file into $BUILDROOT/$PROJECT/DEBIAN\n";
|
||||||
$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT/DEBIAN/README"`;
|
$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT/DEBIAN/README"`;
|
||||||
|
|
||||||
print "Copy copyright file into $BUILDROOT/$PROJECT/DEBIAN\n";
|
print "Copy copyright file into $BUILDROOT/$PROJECT/DEBIAN\n";
|
||||||
$ret=`cp "$SOURCE/COPYRIGHT" "$BUILDROOT/$PROJECT/DEBIAN/copyright"`;
|
$ret=`cp "$SOURCE/COPYRIGHT" "$BUILDROOT/$PROJECT/DEBIAN/copyright"`;
|
||||||
|
|
||||||
#print "Copy apache conf file into $BUILDROOT/$PROJECT/etc/$PROJECT\n";
|
#print "Copy apache conf file into $BUILDROOT/$PROJECT/etc/$PROJECT\n";
|
||||||
#$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT/etc/$PROJECT"`;
|
#$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT/etc/$PROJECT"`;
|
||||||
|
|
||||||
print "Create directory $BUILDROOT/$PROJECT/usr/share/$PROJECT/documents\n";
|
print "Create directory $BUILDROOT/$PROJECT/usr/share/$PROJECT/documents\n";
|
||||||
$ret=`mkdir -p "$BUILDROOT/$PROJECT/usr/share/$PROJECT/documents"`;
|
$ret=`mkdir -p "$BUILDROOT/$PROJECT/usr/share/$PROJECT/documents"`;
|
||||||
|
|
||||||
print "Set permissions/owners on files/dir\n";
|
print "Set permissions/owners on files/dir\n";
|
||||||
$ret=`chown -R root.root $BUILDROOT/$PROJECT`;
|
$ret=`chown -R root.root $BUILDROOT/$PROJECT`;
|
||||||
$ret=`chown -R www-data.www-data $BUILDROOT/$PROJECT/usr/share/$PROJECT/documents`;
|
$ret=`chown -R www-data.www-data $BUILDROOT/$PROJECT/usr/share/$PROJECT/documents`;
|
||||||
$ret=`chmod -R 555 $BUILDROOT/$PROJECT`;
|
$ret=`chmod -R 555 $BUILDROOT/$PROJECT`;
|
||||||
$ret=`chmod 755 $BUILDROOT/$PROJECT`;
|
$ret=`chmod 755 $BUILDROOT/$PROJECT`;
|
||||||
$ret=`chmod -R 755 $BUILDROOT/$PROJECT/usr/share/$PROJECT/documents`;
|
$ret=`chmod -R 755 $BUILDROOT/$PROJECT/usr/share/$PROJECT/documents`;
|
||||||
$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();
|
$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");
|
chdir("$olddir");
|
||||||
|
|
||||||
if ($OS =~ /windows/i)
|
if ($OS =~ /windows/i)
|
||||||
{
|
{
|
||||||
print "Move ${FILENAMEDEB}.deb to $BUILDROOT/${FILENAMEDEB}.deb\n";
|
print "Move ${FILENAMEDEB}.deb to $BUILDROOT/${FILENAMEDEB}.deb\n";
|
||||||
@ -498,33 +499,33 @@ if ($nboftargetok) {
|
|||||||
print "Move ${FILENAMEDEB}.deb to $BUILDROOT/${FILENAMEDEB}.deb\n";
|
print "Move ${FILENAMEDEB}.deb to $BUILDROOT/${FILENAMEDEB}.deb\n";
|
||||||
$ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`;
|
$ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`;
|
||||||
}
|
}
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($target eq 'EXE') {
|
if ($target eq 'EXE') {
|
||||||
unlink "$FILENAMEEXE.exe";
|
unlink "$DESTI/$FILENAMEEXE.exe";
|
||||||
print "Compress into $FILENAMEEXE.exe by $FILENAMEEXE.nsi...\n";
|
print "Compress into $FILENAMEEXE.exe by $FILENAMEEXE.nsi...\n";
|
||||||
$command="\"$REQUIREMENTTARGET{$target}\" /DMUI_VERSION_DOT=$MAJOR.$MINOR.$BUILD /X\"SetCompressor bzip2\" \"$SOURCE\\build\\exe\\$FILENAME.nsi\"";
|
$command="\"$REQUIREMENTTARGET{$target}\" /DMUI_VERSION_DOT=$MAJOR.$MINOR.$BUILD /X\"SetCompressor bzip2\" \"$SOURCE\\build\\exe\\$FILENAME.nsi\"";
|
||||||
print "$command\n";
|
print "$command\n";
|
||||||
$ret=`$command`;
|
$ret=`$command`;
|
||||||
print "Move $FILENAMEEXE.exe to $DESTI\n";
|
print "Move $FILENAMEEXE.exe to $DESTI\n";
|
||||||
rename("$SOURCE\\build\\exe\\$FILENAMEEXE.exe","$DESTI/$FILENAMEEXE.exe");
|
rename("$SOURCE\\build\\exe\\$FILENAMEEXE.exe","$DESTI/$FILENAMEEXE.exe");
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($target eq 'EXEDOLIWAMP')
|
|
||||||
{
|
|
||||||
unlink "$FILENAMEEXEDOLIWAMP.exe";
|
|
||||||
print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCE\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
|
|
||||||
$cmd= "iscc.exe \"$SOURCE\\build\\exe\\doliwamp\\doliwamp.iss\"";
|
|
||||||
print "$cmd\n";
|
|
||||||
$ret= `$cmd`;
|
|
||||||
#print "$ret\n";
|
|
||||||
print "Move \"$SOURCE\\build\\$FILENAMEEXEDOLIWAMP.exe\" to $DESTI/$FILENAMEEXEDOLIWAMP.exe\n";
|
|
||||||
rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$DESTI/$FILENAMEEXEDOLIWAMP.exe");
|
|
||||||
next;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
if ($target eq 'EXEDOLIWAMP')
|
||||||
|
{
|
||||||
|
unlink "$DESTI/$FILENAMEEXEDOLIWAMP.exe";
|
||||||
|
print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCE\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
|
||||||
|
$cmd= "iscc.exe \"$SOURCE\\build\\exe\\doliwamp\\doliwamp.iss\"";
|
||||||
|
print "$cmd\n";
|
||||||
|
$ret= `$cmd`;
|
||||||
|
#print "$ret\n";
|
||||||
|
print "Move \"$SOURCE\\build\\$FILENAMEEXEDOLIWAMP.exe\" to $DESTI/$FILENAMEEXEDOLIWAMP.exe\n";
|
||||||
|
rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$DESTI/$FILENAMEEXEDOLIWAMP.exe");
|
||||||
|
next;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -13,6 +13,7 @@ $PROJECT="mymodule";
|
|||||||
@LISTETARGET=("TGZ"); # Possible packages
|
@LISTETARGET=("TGZ"); # Possible packages
|
||||||
%REQUIREMENTTARGET=( # Tool requirement for each package
|
%REQUIREMENTTARGET=( # Tool requirement for each package
|
||||||
"TGZ"=>"tar",
|
"TGZ"=>"tar",
|
||||||
|
"ZIP"=>"7z"
|
||||||
);
|
);
|
||||||
%ALTERNATEPATH=(
|
%ALTERNATEPATH=(
|
||||||
);
|
);
|
||||||
@ -68,6 +69,15 @@ $BUILDROOT="$TEMP/dolibarr-buildroot";
|
|||||||
my $copyalreadydone=0;
|
my $copyalreadydone=0;
|
||||||
my $batch=0;
|
my $batch=0;
|
||||||
|
|
||||||
|
for (0..@ARGV-1) {
|
||||||
|
if ($ARGV[$_] =~ /^-*target=(\w+)/i) { $target=$1; $batch=1; }
|
||||||
|
if ($ARGV[$_] =~ /^-*desti=(.+)/i) { $DESTI=$1; }
|
||||||
|
if ($ARGV[$_] =~ /^-*prefix=(.+)/i) {
|
||||||
|
$PREFIX=$1;
|
||||||
|
$FILENAMESNAPSHOT.="-".$PREFIX;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
print "Makepack module version $VERSION\n";
|
print "Makepack module version $VERSION\n";
|
||||||
print "Enter name for your module (mymodule, mywonderfulmondule, ...) : ";
|
print "Enter name for your module (mymodule, mywonderfulmondule, ...) : ";
|
||||||
$PROJECT=<STDIN>;
|
$PROJECT=<STDIN>;
|
||||||
@ -89,7 +99,7 @@ if (! -f "makepack-".$PROJECT.".conf")
|
|||||||
print "Enter value for version: ";
|
print "Enter value for version: ";
|
||||||
$PROJVERSION=<STDIN>;
|
$PROJVERSION=<STDIN>;
|
||||||
chomp($PROJVERSION);
|
chomp($PROJVERSION);
|
||||||
($MAJOR,$MINOR)=split(/\./,$PROJVERSION,2);
|
($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
|
||||||
if ($MINOR eq '')
|
if ($MINOR eq '')
|
||||||
{
|
{
|
||||||
print "Enter value for minor version: ";
|
print "Enter value for minor version: ";
|
||||||
@ -99,6 +109,7 @@ if ($MINOR eq '')
|
|||||||
|
|
||||||
$FILENAME="$PROJECT";
|
$FILENAME="$PROJECT";
|
||||||
$FILENAMETGZ="module_$PROJECT-$MAJOR.$MINOR";
|
$FILENAMETGZ="module_$PROJECT-$MAJOR.$MINOR";
|
||||||
|
$FILENAMEZIP="module_$PROJECT-$MAJOR.$MINOR";
|
||||||
if (-d "/usr/src/redhat") {
|
if (-d "/usr/src/redhat") {
|
||||||
# redhat
|
# redhat
|
||||||
$RPMDIR="/usr/src/redhat";
|
$RPMDIR="/usr/src/redhat";
|
||||||
@ -111,10 +122,13 @@ if (-d "/usr/src/RPM") {
|
|||||||
$SOURCE="$DIR/..";
|
$SOURCE="$DIR/..";
|
||||||
$DESTI="$SOURCE/build";
|
$DESTI="$SOURCE/build";
|
||||||
|
|
||||||
|
print "Source directory: $SOURCE\n";
|
||||||
|
print "Target directory: $DESTI\n";
|
||||||
|
|
||||||
|
|
||||||
# Choose package targets
|
# Choose package targets
|
||||||
#-----------------------
|
#-----------------------
|
||||||
$target="TGZ"; # Dolibarr modules are tgz format
|
$target="ZIP"; # Dolibarr modules are this format
|
||||||
$CHOOSEDTARGET{uc($target)}=1;
|
$CHOOSEDTARGET{uc($target)}=1;
|
||||||
|
|
||||||
|
|
||||||
@ -150,46 +164,90 @@ print "\n";
|
|||||||
# Check if there is at least on target to build
|
# Check if there is at least on target to build
|
||||||
#----------------------------------------------
|
#----------------------------------------------
|
||||||
$nboftargetok=0;
|
$nboftargetok=0;
|
||||||
|
$nboftargetneedbuildroot=0;
|
||||||
|
$nboftargetneedcvs=0;
|
||||||
foreach my $target (keys %CHOOSEDTARGET) {
|
foreach my $target (keys %CHOOSEDTARGET) {
|
||||||
if ($CHOOSEDTARGET{$target} < 0) { next; }
|
if ($CHOOSEDTARGET{$target} < 0) { next; }
|
||||||
$nboftargetok++;
|
if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP')
|
||||||
|
{
|
||||||
|
$nboftargetneedbuildroot++;
|
||||||
|
}
|
||||||
|
if ($target eq 'SNAPSHOT')
|
||||||
|
{
|
||||||
|
$nboftargetneedcvs++;
|
||||||
|
}
|
||||||
|
$nboftargetok++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($nboftargetok) {
|
if ($nboftargetok) {
|
||||||
|
|
||||||
# Update buildroot
|
# Update CVS if required
|
||||||
#-----------------
|
#-----------------------
|
||||||
if (! $copyalreadydone) {
|
if ($nboftargetneedcvs)
|
||||||
print "Delete directory $BUILDROOT\n";
|
{
|
||||||
$ret=`rm -fr "$BUILDROOT"`;
|
print "Go to directory $SOURCE\n";
|
||||||
mkdir "$BUILDROOT";
|
$olddir=getcwd();
|
||||||
|
chdir("$SOURCE");
|
||||||
$result=open(IN,"<makepack-".$PROJECT.".conf");
|
print "Run cvs update -P -d\n";
|
||||||
if (! $result) { die "Error: Can't open conf file makepack-".$PROJECT.".conf for reading.\n"; }
|
$ret=`cvs update -P -d 2>&1`;
|
||||||
while(<IN>)
|
chdir("$olddir");
|
||||||
{
|
}
|
||||||
if ($_ =~ /^#/) { next; } # Do not process comments
|
|
||||||
|
# Update buildroot if required
|
||||||
$_ =~ s/\n//;
|
#-----------------------------
|
||||||
$_ =~ /^(.*)\/[^\/]+/;
|
if ($nboftargetneedbuildroot)
|
||||||
print "Create directory $BUILDROOT/$1\n";
|
{
|
||||||
$ret=`mkdir -p "$BUILDROOT/$1"`;
|
if (! $copyalreadydone) {
|
||||||
print "Copy $SOURCE/$_ into $BUILDROOT/$_\n";
|
print "Delete directory $BUILDROOT\n";
|
||||||
$ret=`cp -pr "$SOURCE/$_" "$BUILDROOT/$_"`;
|
$ret=`rm -fr "$BUILDROOT"`;
|
||||||
}
|
|
||||||
close IN;
|
|
||||||
|
|
||||||
@timearray=localtime(time());
|
|
||||||
$fulldate=($timearray[5]+1900).'-'.($timearray[4]+1).'-'.$timearray[3].' '.$timearray[2].':'.$timearray[1];
|
|
||||||
$versionfile=open(VF,">$BUILDROOT/build/version-".$PROJECT.".txt");
|
|
||||||
|
|
||||||
print "Create version file $BUILDROOT/build/version-".$PROJECT.".txt with date ".$fulldate."\n";
|
mkdir "$BUILDROOT";
|
||||||
$ret=`mkdir -p "$BUILDROOT/build"`;
|
mkdir "$BUILDROOT/$PROJECT";
|
||||||
print VF "Version: ".$MAJOR.".".$MINOR."\n";
|
|
||||||
print VF "Build : ".$fulldate."\n";
|
$result=open(IN,"<makepack-".$PROJECT.".conf");
|
||||||
close VF;
|
if (! $result) { die "Error: Can't open conf file makepack-".$PROJECT.".conf for reading.\n"; }
|
||||||
}
|
while(<IN>)
|
||||||
|
{
|
||||||
|
if ($_ =~ /^#/) { next; } # Do not process comments
|
||||||
|
|
||||||
|
$_ =~ s/\n//;
|
||||||
|
$_ =~ /^(.*)\/[^\/]+/;
|
||||||
|
print "Create directory $BUILDROOT/$PROJECT/$1\n";
|
||||||
|
$ret=`mkdir -p "$BUILDROOT/$PROJECT/$1"`;
|
||||||
|
print "Copy $SOURCE/$_ into $BUILDROOT/$PROJECT/$_\n";
|
||||||
|
$ret=`cp -pr "$SOURCE/$_" "$BUILDROOT/$PROJECT/$_"`;
|
||||||
|
}
|
||||||
|
close IN;
|
||||||
|
|
||||||
|
@timearray=localtime(time());
|
||||||
|
$fulldate=($timearray[5]+1900).'-'.($timearray[4]+1).'-'.$timearray[3].' '.$timearray[2].':'.$timearray[1];
|
||||||
|
open(VF,">$BUILDROOT/$PROJECT/build/version-".$PROJECT.".txt");
|
||||||
|
|
||||||
|
print "Create version file $BUILDROOT/$PROJECT/build/version-".$PROJECT.".txt with date ".$fulldate."\n";
|
||||||
|
$ret=`mkdir -p "$BUILDROOT/$PROJECT/build"`;
|
||||||
|
print VF "Version: ".$MAJOR.".".$MINOR."\n";
|
||||||
|
print VF "Build : ".$fulldate."\n";
|
||||||
|
close VF;
|
||||||
|
}
|
||||||
|
print "Clean $BUILDROOT\n";
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/index.php`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/document`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/test`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS*`;
|
||||||
|
}
|
||||||
|
|
||||||
# Build package for each target
|
# Build package for each target
|
||||||
#------------------------------
|
#------------------------------
|
||||||
@ -216,19 +274,26 @@ if ($nboftargetok) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($target eq 'ZIP') {
|
if ($target eq 'ZIP') {
|
||||||
unlink "$FILENAMEZIP.zip";
|
print "Remove target $FILENAMEZIP.zip...\n";
|
||||||
print "Compress $FILENAMETGZ into $FILENAMEZIP.zip...\n";
|
unlink "$DESTI/$FILENAMEZIP.zip";
|
||||||
chdir("$BUILDROOT");
|
print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
|
||||||
#print "cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*\n";
|
|
||||||
#$ret=`cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
|
print "Go to directory $BUILDROOT/$PROJECT\n";
|
||||||
$ret=`7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
|
$olddir=getcwd();
|
||||||
print "Move $FILENAMEZIP.zip to $DESTI\n";
|
chdir("$BUILDROOT/$PROJECT");
|
||||||
rename("$BUILDROOT/$FILENAMEZIP.zip","$DESTI/$FILENAMEZIP.zip");
|
$cmd= "7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip *";
|
||||||
|
print $cmd."\n";
|
||||||
|
$ret= `$cmd`;
|
||||||
|
chdir("$olddir");
|
||||||
|
|
||||||
|
print "Move $FILENAMEZIP.zip to $DESTI/$FILENAMEZIP.zip\n";
|
||||||
|
$ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$DESTI/$FILENAMEZIP.zip"`;
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($target eq 'EXE') {
|
if ($target eq 'EXE') {
|
||||||
unlink "$FILENAMEEXE.exe";
|
print "Remove target $FILENAMEEXE.exe...\n";
|
||||||
|
unlink "$DESTI/$FILENAMEEXE.exe";
|
||||||
print "Compress into $FILENAMEEXE.exe by $FILENAMEEXE.nsi...\n";
|
print "Compress into $FILENAMEEXE.exe by $FILENAMEEXE.nsi...\n";
|
||||||
$command="\"$REQUIREMENTTARGET{$target}\" /DMUI_VERSION_DOT=$MAJOR.$MINOR.$BUILD /X\"SetCompressor bzip2\" \"$SOURCE\\build\\exe\\$FILENAME.nsi\"";
|
$command="\"$REQUIREMENTTARGET{$target}\" /DMUI_VERSION_DOT=$MAJOR.$MINOR.$BUILD /X\"SetCompressor bzip2\" \"$SOURCE\\build\\exe\\$FILENAME.nsi\"";
|
||||||
print "$command\n";
|
print "$command\n";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user