Menu
▾
▴
[Armagetronad-commits] SF.net SVN: armagetronad:[9772] armagetronad/trunk
|
From: <z-...@us...> - 2011-08-27 14:47:27
|
Revision: 9772
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9772&view=rev
Author: z-man
Date: 2011-08-27 14:47:21 +0000 (Sat, 27 Aug 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9765 to 9771:
------------------------------------------------------------------------
r9771 | bazaaarmagetron | 2011-08-27 16:25:02 +0200 (Sat, 27 Aug 2011) | 2 lines
Manuel Moos: Only put in very specific libjpeg version.
------------------------------------------------------------------------
r9770 | bazaaarmagetron | 2011-08-27 16:24:35 +0200 (Sat, 27 Aug 2011) | 2 lines
Manuel Moos: reverted accidental test change
------------------------------------------------------------------------
r9769 | bazaaarmagetron | 2011-08-27 16:20:57 +0200 (Sat, 27 Aug 2011) | 2 lines
Manuel Moos: Adding more libraries.
------------------------------------------------------------------------
r9768 | bazaaarmagetron | 2011-08-27 16:20:28 +0200 (Sat, 27 Aug 2011) | 4 lines
author: Manuel Moos
Delegating portable app work into script.
Putting needed libries into appdir so we don't have to link dynamically.
------------------------------------------------------------------------
r9767 | bazaaarmagetron | 2011-08-27 13:04:09 +0200 (Sat, 27 Aug 2011) | 2 lines
Manuel Moos: Properly uploading portable app.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9765&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9771&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9770&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9769&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9768&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9767&view=rev
Modified Paths:
--------------
armagetronad/trunk/build/WorkMakefile
armagetronad/trunk/build/portable/AppRun
armagetronad/trunk/build/scripts/lp-upload
Added Paths:
-----------
armagetronad/trunk/build/portable/build
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9765
/armagetronad/branches/0.2.8.3:9309-9740
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9771
/armagetronad/branches/0.2.8.3:9309-9740
Modified: armagetronad/trunk/build/WorkMakefile
===================================================================
--- armagetronad/trunk/build/WorkMakefile 2011-08-27 14:25:02 UTC (rev 9771)
+++ armagetronad/trunk/build/WorkMakefile 2011-08-27 14:47:21 UTC (rev 9772)
@@ -444,7 +444,7 @@
# configure and make
bash scripts/configure $(GENERIC_CLIENT_DIR) $(SOURCEDIR) --prefix='/usr/local' --disable-uninstall --disable-sysinstall --disable-restoreold --enable-etc --disable-initscripts --enable-automakedefaults --disable-useradd --enable-armathentication
- make -C $(GENERIC_CLIENT_DIR)
+ ${MAKE} -C $(GENERIC_CLIENT_DIR)
touch $@
# portable client build
@@ -454,7 +454,7 @@
APPDIR=$(RCDIR)/$(PORTABLE_CLIENT_NAME).AppDir
PORTABLE_CLIENT=$(UPLOAD)/$(PORTABLE_CLIENT_NAME)_${VERSION}
portable_client: $(PORTABLE_CLIENT)
-$(PORTABLE_CLIENT): $(GENERIC_CLIENT_DIR).tag portable/AppRun
+$(PORTABLE_CLIENT): $(GENERIC_CLIENT_DIR).tag portable/AppRun portable/build WorkMakefile
#
# *****************************************
# * package portable client
@@ -462,20 +462,11 @@
#
# install into appdir
rm -rf ${APPDIR}
- make -C ${GENERIC_CLIENT_DIR} DESTDIR=$$(pwd)/${APPDIR} install
+ ${MAKE} -C ${GENERIC_CLIENT_DIR} DESTDIR=$$(pwd)/${APPDIR} install
-# add AppRun and desktop file
- cp portable/AppRun $(APPDIR)/
- find ${APPDIR} -name "*.desktop" -exec mv \{\} ${APPDIR}/ \;
+# delegate
+ APPDIR=${APPDIR} PORTABLE_CLIENT=${PORTABLE_CLIENT} PACKAGE=${PACKAGE} portable/build
-# hack Icon
- find ${APPDIR} -type d -name "desktop" -exec cp \{\}/icons/large/armagetronad.png ${APPDIR}/${PACKAGE}.png \;
-
-# and pack it up. The script is stupidly only available inside a portable app
-# called AppImageAssistant; fetch it and extract it with AppImageExtractor
-# to /usr/local/bin/.
- /usr/local/bin/AppImageAssistant.AppDir/package ${APPDIR} ${PORTABLE_CLIENT}
-
$(RCDIR)/doc.%: $(RCDIR)/doc.%.build
APFILE=$(RCDIR)/.package
Modified: armagetronad/trunk/build/portable/AppRun
===================================================================
--- armagetronad/trunk/build/portable/AppRun 2011-08-27 14:25:02 UTC (rev 9771)
+++ armagetronad/trunk/build/portable/AppRun 2011-08-27 14:47:21 UTC (rev 9772)
@@ -5,3 +5,4 @@
EXECPATH=$(grep -m 1 -r Path= ./*.desktop | cut -d "=" -f 2 | cut -d % -f 1)
#append library path so system libraries are found first
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:./usr/local/lib:./usr/lib" PATH=".${EXECPATH}:${PATH}" exec $EXEC $@
+#LD_LIBRARY_PATH="./usr/local/lib:./usr/lib:${LD_LIBRARY_PATH}" PATH=".${EXECPATH}:${PATH}" exec $EXEC $@
Copied: armagetronad/trunk/build/portable/build (from rev 9771, armagetronad/branches/0.2.8/build/portable/build)
===================================================================
--- armagetronad/trunk/build/portable/build (rev 0)
+++ armagetronad/trunk/build/portable/build 2011-08-27 14:47:21 UTC (rev 9772)
@@ -0,0 +1,66 @@
+#!/bin/bash
+# builds portable client
+
+# set -x
+
+# add AppRun and desktop file
+cp portable/AppRun ${APPDIR}/
+find ${APPDIR} -name "*.desktop" -exec mv \{\} ${APPDIR}/ \;
+
+# hack Icon
+find ${APPDIR} -type d -name "desktop" -exec cp \{\}/icons/small/armagetronad.png ${APPDIR}/${PACKAGE}.png \;
+
+lastpath=
+
+function copylib()
+{
+ baselib=$1
+ path=$(dirname ${baselib})
+ baselib=$(basename ${baselib})
+ echo "Found in ${path}."
+ if test -n "$lastpath" && test "$lastpath" != "$path"; then
+ echo "error: different paths detected, frankenbuild!"
+ exit 1
+ fi
+ lastpath=$path
+ while test -n "${baselib}"; do
+ # copy libary
+ echo Copying ${baselib}...
+ cp -ax "${path}/${baselib}" ${APPDIR}/usr/local/lib/
+ # resolve links
+ baselib=$(ls -l ${path}/${baselib} | grep -- "->" | sed -e "s,.*-> ,,")
+ done
+}
+
+# include libraries
+mkdir -p ${APPDIR}/usr/local/lib/
+for library in \
+libxml2 \
+libZThread \
+libSDL-1 \
+libSDL_image libpng \
+; do
+ echo "Checking for library ${library}...."
+ baselib=$(ldd ${APPDIR}/usr/local/bin/${PACKAGE} | grep "${library}" | sed -e "s,.*=> ,," -e "s, (.*,,")
+ if test -z "${baselib}"; then
+ echo "Not linked."
+ else
+ copylib ${baselib}
+ fi
+done
+
+for library in \
+libjpeg.so.62 \
+; do
+ echo "Installing library ${library} anyway, we know it's needed."
+ copylib ${lastpath}/${library}
+done
+
+
+echo $lastpath
+
+# and pack it up. The script is stupidly only available inside a portable app
+# called AppImageAssistant; fetch it and extract it with AppImageExtractor
+# to /usr/local/bin/.
+rm -f ${PORTABLE_CLIENT}
+/usr/local/bin/AppImageAssistant.AppDir/package ${APPDIR} ${PORTABLE_CLIENT}
Modified: armagetronad/trunk/build/scripts/lp-upload
===================================================================
--- armagetronad/trunk/build/scripts/lp-upload 2011-08-27 14:25:02 UTC (rev 9771)
+++ armagetronad/trunk/build/scripts/lp-upload 2011-08-27 14:47:21 UTC (rev 9772)
@@ -121,7 +121,7 @@
try:
uploads=[]
for f in builds:
- if os.path.exists(f):
+ if os.path.exists(f) and os.path.splitext(f)[1] != ".asc":
prepare_file(f)
basename, extension = os.path.splitext(f)
basename, secondextension = os.path.splitext(basename)
@@ -131,7 +131,7 @@
# default types
mime_type="application/octet-stream"
file_type="Installer file"
- description="Portable App"
+ description="Portable App for Linux"
if secondextension == ".src" or thirdextension == ".src":
file_type="Code Release Tarball"
@@ -158,7 +158,9 @@
description="Windows Installer"
mime_type="application/exe"
Windows=True
- if "dedicated" in f:
+ if "Portable App" in description:
+ Linux=True
+ if "edicated" in f:
description="Server " + description
else:
if "-common" in f and extension == ".deb":
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|