GuillaumeHemmen/projectlibre-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/projectlibre/code synced 2024-11-01 03:21:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit '71f538' into dev

Browse source 
Conflicts:
	openproj_core/src/org/openproj/util/UpdateChecker.java
This commit is contained in:
Laurent Chretienneau 2015-06-21 14:07:20 +02:00
commit 9b5b5b60b1
5 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.gitignore vendored
View file

@ -1,3 +1,12 @@
.DS_Store
.class
*/bin/*
openproj_build/build-override.properties
openproj_build/build/
openproj_build/dist/
openproj_build/packages/
openproj_contrib/build/
openproj_contrib/openproj-contrib.jar
openproj_contrib/openproj-reports.jar
openproj_contrib/openproj-script.jar
openproj_contrib/tmp/

2
openproj_build/build.properties
View file

@ -20,6 +20,8 @@ rpm_rpmbuild=/usr/local/bin/rpmbuild
deb=deb/projectlibre
debroot=deb
dpkg_deb=/opt/local/bin/dpkg-deb
gnu_tar=gnutar
macapp=ProjectLibre.app

7
openproj_build/build.xml
View file

@ -368,8 +368,8 @@
<arg value="root:wheel"/>
<arg value="${deb}"/>
</exec-->
<exec executable="/opt/local/bin/dpkg-deb">
<exec executable="${dpkg_deb}">
<arg value="--build"/>
<arg value="${basedir}/${deb}"/>
<arg value="${basedir}/${debroot}/projectlibre_${deb_version}-${deb_revision}.deb"/>
@ -381,8 +381,9 @@
<arg value="${user.name}"/>
<arg value="${debroot}"/>
</exec-->
<exec executable="sh"> <!-- dpkg-deb package with wheel group on Mac OS X is causing check issues on Ubuntu. Workaround to put numeric owner group in tars. requires gnutar -->
<exec executable="sh"> <!-- dpkg-deb package with wheel group on Mac OS X is causing check issues on Ubuntu. Workaround to put numeric owner group in tars. requires GNU tar -->
<arg value="resources/deb/cleandeb.sh"/>
<arg value="${gnu_tar}"/>
<arg value="${basedir}/${debroot}"/>
<arg value="projectlibre_${deb_version}-${deb_revision}.deb"/>
<arg value="projectlibre_${deb_version}-${deb_revision}.deb"/>

17
openproj_build/resources/deb/cleandeb.sh
View file

@ -1,15 +1,16 @@
#!/bin/bash
P="$1"
DEB="$2"
DEB2="$3"
GNU_TAR="$1"
P="$2"
DEB="$3"
DEB2="$4"
cd "$P"
mkdir -p "$P"/tmp
cd "$P"/tmp
ar -x "$P"/"$DEB"
gnutar -xzvf control.tar.gz
gnutar -xzvf data.tar.gz
gnutar --numeric-owner --owner=0 --group=0 -czvf control.tar.gz control postinst postrm
gnutar --numeric-owner --owner=0 --group=0 -czvf data.tar.gz usr
"${GNU_TAR}" -xzvf control.tar.gz
"${GNU_TAR}" -xzvf data.tar.gz
"${GNU_TAR}" --numeric-owner --owner=0 --group=0 -czvf control.tar.gz control postinst postrm
"${GNU_TAR}" --numeric-owner --owner=0 --group=0 -czvf data.tar.gz usr
ar -r "$P"/"$DEB2" debian-binary control.tar.gz data.tar.gz
cd ..
rm -rf tmp

7
openproj_core/src/org/openproj/util/UpdateChecker.java
View file

@ -81,10 +81,9 @@ public class UpdateChecker {
private static final String updateAddress = "http://projectlibre.org/versions-"+UPDATE_CHECKER_VERSION; //claur openproj.org version not working any more
private static final String downloadAddress = "http://sourceforge.net/projects/projectlibre/files/latest/download";
private static void checkForUpdate() {
if (!Preferences.userNodeForPackage(UpdateChecker.class).getBoolean("checkForUpdates", true) ) {
return;
}
if (! Preferences.userNodeForPackage(UpdateChecker.class).getBoolean("checkForUpdates", true) ) {
return;
}
String thisVersion = VersionUtils.getVersion();//Messages.getString("Release.version");
if (thisVersion==null) thisVersion="0";
URL url;