diff --git a/build/aps/APP-META.xml b/build/aps/APP-META.xml
new file mode 100755
index 0000000000000..f4c877aa96147
--- /dev/null
+++ b/build/aps/APP-META.xml
@@ -0,0 +1,119 @@
+
+
+
+http://www.dolibarr.org/
+Dolibarr
+__VERSION__
+__RELEASE__
+http://www.dolibarr.org/
+
+Dolibarr
+http://www.dolibarr.org/
+
+
+
+Parallels
+http://parallels.com
+uuid:714f0a7b-85d6-4eb8-b68e-40f9acbb3103
+
+
+Dolibarr ERP - CRM, the easy to use software to manage small or medium companies, freelancers or foundations
+
+Dolibarr is a free modular software (you see only features you need) to manage small and medium companies, freelancers or foundations.
+This Opensource software is designed to provide all features you need to manage information on many aspects of your business
+into an intuitive and user-friendly graphical interface
+It's an OpenSource software you can install on a web server or as a standalone software. Dolibarr is designed to provide simplicity:
+* Simple to use (any module can be disabled to removed not required features, only the permissions features can not be disabled).
+* Simple to install (with DoliWamp the auto-installer for Windows, DoliBuntu, the auto-installer for Ubuntu/Debian or DoliMamp the auto-installer for Mac OS X, for those who do not know how to install an Apache server, MySQL, PHP. A web assistant is available for others, no additional components required, no Java, no Python, no Perl, no PEARL PHP modules, no other exotic library).
+* Simple for development (no heavy frameworks). Dolibarr, developed in PHP object, incorporates its own natural code, allowing every developer to be immediately operational, with no other knowledge than PHP).
+
+
+
+Screenshot 1
+
+
+
+See http://www.dolibarr.org/files/ChangeLog
+
+
+
+Back office/Customer Relationship Management
+
+
+en
+fr
+es
+de
+pt
+
+
+
+
+
+
+
+
+GPLv2
+COPYING
+
+
+
+Dolibarr instance
+
+
+Application entry point
+
+
+
+
+
+
+Administrator's preferences
+
+Administrator's login
+Please make sure the text you entered
+starts with a letter and continues with either numbers,
+letters, underscores or hyphens.
+
+
+Password
+
+
+
+
+
+
+mysql
+mbstring
+false
+
+main
+dolibarr
+false
+mysql
+4.1.0
+
+
+
+
+
+dolibarr
+35000000
+
+
+php
+
+
+
+
+
+php
+
+
+
+
\ No newline at end of file
diff --git a/build/aps/configure b/build/aps/configure
new file mode 100755
index 0000000000000..365aec19b825a
--- /dev/null
+++ b/build/aps/configure
@@ -0,0 +1 @@
+# This script will be invoked when application instance is to be setup
\ No newline at end of file
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index b6424ee616cb6..ea265d1c0d40e 100644
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -2,7 +2,7 @@
#----------------------------------------------------------------------------
# \file build/makepack-dolibarr.pl
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe)
-# \version $Id$
+# \version $Id: makepack-dolibarr.pl,v 1.103 2011/06/24 23:10:52 eldy Exp $
# \author (c)2004-2011 Laurent Destailleur
#----------------------------------------------------------------------------
@@ -14,14 +14,14 @@
$BUILD="0-dev"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
$RPMSUBVERSION="auto"; # auto use value found into BUILD
-@LISTETARGET=("TGZ","ZIP","RPM","DEB","EXE","EXEDOLIWAMP","SNAPSHOT"); # Possible packages
+@LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages
%REQUIREMENTTARGET=( # Tool requirement for each package
"SNAPSHOT"=>"tar",
"TGZ"=>"tar",
"ZIP"=>"7z",
"RPM"=>"rpmbuild",
"DEB"=>"dpkg",
-"EXE"=>"makensis.exe",
+"APS"=>"zip",
"EXEDOLIWAMP"=>"iscc.exe"
);
%ALTERNATEPATH=(
@@ -35,7 +35,7 @@
$FILENAMEZIP="$PROJECT-$MAJOR.$MINOR.$BUILD";
$FILENAMERPM="$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION";
$FILENAMEDEB="$PROJECT-$MAJOR.$MINOR.$BUILD";
-$FILENAMEEXE="$PROJECT-$MAJOR.$MINOR.$BUILD";
+$FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app";
$FILENAMEEXEDOLIWAMP="$PROJECT-$MAJOR.$MINOR.$BUILD";
if (-d "/usr/src/redhat") {
# redhat
@@ -48,7 +48,7 @@
use vars qw/ $REVISION $VERSION /;
-$REVISION='$Revision$'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
+$REVISION='$Revision: 1.103 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$VERSION="1.0 (build $REVISION)";
@@ -460,7 +460,6 @@
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/conf/conf*sav*`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/test`;
# To remove once stable
- $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/incluces/modules/facture/doc/doc_generic_invoice_odt.modules.php`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n";
@@ -539,19 +538,81 @@
next;
}
- if ($target eq 'EXE') {
- print "Remove target $FILENAMEEXE.exe...\n";
- unlink "$DESTI/$FILENAMEEXE.exe";
+ if ($target eq 'APS') {
+ print "Remove target $FILENAMEAPS.zip...\n";
+ unlink "$DESTI/$FILENAMEAPS.zip";
- print "Compress into $FILENAMEEXE.exe by $FILENAMEEXE.nsi...\n";
- $cmd="\"$REQUIREMENTTARGET{$target}\" /DMUI_VERSION_DOT=$MAJOR.$MINOR.$BUILD /X\"SetCompressor bzip2\" \"$SOURCE\\build\\exe\\$FILENAME.nsi\"";
- print "$cmd\n";
- $ret=`$cmd`;
- print "Move $FILENAMEEXE.exe to $DESTI\n";
- rename("$SOURCE\\build\\exe\\$FILENAMEEXE.exe","$DESTI/$FILENAMEEXE.exe");
- next;
+ #rmdir "$BUILDROOT/$PROJECT.tmp";
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
+ print "Create directory $BUILDROOT/$PROJECT.tmp\n";
+ $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp"`;
+ print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp\n";
+ $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\"";
+ $ret=`$cmd`;
+
+ print "Remove other files\n";
+ $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/DoliWamp-*`;
+ $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/DoliMamp-*`;
+ $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/dolibarr-*.tar`;
+ $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/dolibarr-*.tgz`;
+ $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/dolibarr-*.zip`;
+ $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/dolibarr-*.deb`;
+ $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/doxygen/doxygen_warnings.log`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/html`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/dbmodel`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/fpdf`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/initdata`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/iso-normes`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/phpcheckstyle`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/phpunit`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/spec`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/uml`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/xdebug`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/doc/flyer`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/doc/font`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/doc/tshirt`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/doc/rollup`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/conf/conf.php.mysql`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/conf/conf.php.old`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/conf/conf.php.postgres`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/conf/conf*sav*`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/test`;
+
+ print "Create APS files\n";
+ $cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/APP-META.xml\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml\"";
+ $ret=`$cmd`;
+ $cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure\"";
+ $ret=`$cmd`;
+ $cmd="cp -pr \"$BUILDROOT/$PROJECT/doc/images\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/images\"";
+ $ret=`$cmd`;
+
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc`;
+
+ print "Compress $BUILDROOT/$PROJECT.tmp/$PROJECT into $FILENAMEAPS.zip...\n";
+
+ print "Go to directory $BUILDROOT/$PROJECT.tmp\n";
+ $olddir=getcwd();
+ chdir("$BUILDROOT\/$PROJECT.tmp");
+ #$cmd= "7z a -r -tzip -xr\@\"$BUILDROOT\/$PROJECT.tmp\/$PROJECT\/build\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEAPS.zip $BUILDROOT/$PROJECT.tmp/$PROJECT\\*";
+ $cmd= "zip -9 -r $BUILDROOT/$FILENAMEAPS.zip $PROJECT\\*";
+ print $cmd."\n";
+ $ret= `$cmd`;
+ chdir("$olddir");
+
+ if ($OS =~ /windows/i)
+ {
+ print "Move $FILENAMEAPS.zip to $DESTI/$FILENAMEAPS.zip\n";
+ $ret=`mv "$BUILDROOT/$FILENAMEAPS.zip" "$DESTI/$FILENAMEAPS.zip"`;
+ }
+ else
+ {
+ print "Move $FILENAMEAPS.zip to $DESTI/$FILENAMEAPS.zip\n";
+ $ret=`mv "$BUILDROOT/$FILENAMEAPS.zip" "$DESTI/$FILENAMEAPS.zip"`;
+ }
+ next;
}
-
+
if ($target eq 'EXEDOLIWAMP')
{
print "Remove target $FILENAMEEXEDOLIWAMP.exe...\n";