[tuxdroid-svn] r4699 - in software_suite_v2/tuxware/installers/unix/trunk: . build_deps/tar

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-05-29 11:09:58 +0200 (Fri, 29 May 2009)
New Revision: 4699

Added:
   software_suite_v2/tuxware/installers/unix/trunk/build_deps/tar/Makefile.amd64
Modified:
   software_suite_v2/tuxware/installers/unix/trunk/build.sh
Log:
* Added new support for the 64 bits architecture (testing)


Modified: software_suite_v2/tuxware/installers/unix/trunk/build.sh
===================================================================
--- software_suite_v2/tuxware/installers/unix/trunk/build.sh	2009-05-29 08:51:23 UTC (rev 4698)
+++ software_suite_v2/tuxware/installers/unix/trunk/build.sh	2009-05-29 09:09:58 UTC (rev 4699)
@@ -201,6 +201,14 @@
     cp -r $TEMP_DIR/tuxhttpserver/* $MIRROR_DIR/$PREFIX/$SERVER_DIR
 }
 
+# Include Python32
+packPython32 () {
+    echo "-- Copying python for 32 bits "
+    mkdir $MIRROR_DIR/tmp
+    wget http://ftp.kysoh.com/apps/installers/unix/python32/Python32.tar.gz -O \
+    $MIRROR_DIR/tmp/Python32.tar.gz
+}
+
 # Install the python API from SVN
 packPythAPI () {
     echo "-- Copying the python API"
@@ -497,6 +505,9 @@
     echo "Creating post install script"
     sed "s;PREFIX=;PREFIX=$PREFIX;g" build_deps/deb/postinst \
     >$POSTINST
+    if [ $ARCH == "amd64" ]; then
+	echo 'tar -xvf /tmp/Python32.tar.gz -C /opt/' >> $POSTINST
+    fi
     chmod +x $POSTINST
 }
 
@@ -522,8 +533,14 @@
 ####### TAR.GZ SPECIFIC ########
 packTarSpecifics () {
     cp -rf ./build_deps/tar/* $BUILD_DIR/
-    sed "s;PREFIX=;PREFIX=$PREFIX;g" build_deps/tar/Makefile \
-    >$BUILD_DIR/Makefile
+    if [ $ARCH == "amd64" ]; then
+    	sed "s;PREFIX=;PREFIX=$PREFIX;g" build_deps/tar/Makefile.amd64 \
+	>$BUILD_DIR/Makefile
+
+    else
+    	sed "s;PREFIX=;PREFIX=$PREFIX;g" build_deps/tar/Makefile \
+	>$BUILD_DIR/Makefile
+    fi
 }
 
 
@@ -666,6 +683,10 @@
     case $options in
 	a)
             ARCH=amd64
+	    
+	    DEPS="libc6(>=2.3), python, libasound2, python-ctypes, libstdc++5, \
+	    python-xml, libportaudio2, openjdk-6-jre, python-dev, python-setuptools, sox, \
+	    lame, ia32-libs"
 	    ;;
         q)
             SOURCE=$QC
@@ -731,6 +752,9 @@
 createBaseDir
 # <--- Download stuff from SVN --->
 packServer
+if [ $ARCH == "amd64" ]; then
+    packPython32
+fi
 packPythAPI
 compileDriver
 packJavaAPI

Added: software_suite_v2/tuxware/installers/unix/trunk/build_deps/tar/Makefile.amd64
===================================================================
--- software_suite_v2/tuxware/installers/unix/trunk/build_deps/tar/Makefile.amd64	                        (rev 0)
+++ software_suite_v2/tuxware/installers/unix/trunk/build_deps/tar/Makefile.amd64	2009-05-29 09:09:58 UTC (rev 4699)
@@ -0,0 +1,59 @@
+PREFIX=
+all:
+	@echo Usage make install; make uninstall
+install:
+	echo Installing Tux Droid
+	echo Cleanup the system ...
+	rm -f /etc/tuxdroid/tuxdroid.conf
+	rm -f /usr/bin/tuxsh
+	rm -f /usr/bin/tux_updater
+	rm -f /usr/bin/tux_control_center
+	rm -f /usr/bin/tuxhttpserver
+	rm -f /usr/bin/tuxgi
+	rm -f /usr/bin/dfu-programmer
+	rm -f /usr/bin/tux_wifi_channel
+	rm -f /usr/bin/tuxup
+	echo Copying files
+	if [ ! -e $(PREFIX) ]; then mkdir -p $(PREFIX); fi
+	if [ ! -e $(PREFIX)/lib ]; then mkdir $(PREFIX)/lib; fi
+	if [ ! -e $(PREFIX)/bin ]; then mkdir $(PREFIX)/bin; fi
+	if [ ! -e $(PREFIX)/share]; then mkdir $(PREFIX)/share; fi
+	if [ ! -e $(PREFIX)/share/applications]; then mkdir $(PREFIX)/share/applications; fi
+	if [ ! -e $(PREFIX)/share/pixmaps]; then mkdir $(PREFIX)/share/pixmaps; fi
+	cp -r ./mirror/etc/* /etc/
+	cp -r ./mirror/opt /
+	cp -r ./mirror/$(PREFIX)/lib/* $(PREFIX)/lib/
+	cp -r ./mirror/$(PREFIX)/bin/* $(PREFIX)/bin/
+	cp -r ./mirror/$(PREFIX)/share/tuxdroid $(PREFIX)/share/
+	cp -r ./mirror/usr/share/applications/* /usr/share/applications/
+	cp -r ./mirror/usr/share/pixmaps/* /usr/share/pixmaps/
+	echo Installing python API
+	cp -r $(PREFIX)/lib/tuxdroid/python-api/tuxisalive .
+	cp $(PREFIX)/lib/tuxdroid/python-api/setup.py .
+	python setup.py install >/dev/null
+	rm -rf tuxisalive setup.py build
+	chmod 0755 $(PREFIX)/share/tuxdroid/tuxhttpserver/tuxhttpserver.py
+	chmod 0755 $(PREFIX)/share/tuxdroid/tux_updater/tux_updater
+	tar -xvf ./mirror/Python32.tar.gz -C /opt/
+	echo Done.
+
+uninstall:
+	echo "Uninstalling Tux Droid"
+	rm -r $(PREFIX)/share/tuxdroid
+	rm -r $(PREFIX)/lib/tuxdroid
+	rm -r /opt/Python32
+	rm $(PREFIX)/bin/tuxsh
+	rm $(PREFIX)/bin/tuxup
+	rm $(PREFIX)/bin/tux_control_center
+	rm $(PREFIX)/bin/tux_updater
+	rm $(PREFIX)/bin/tuxhttpserver
+	rm $(PREFIX)/bin/dfu-programmer
+	rm $(PREFIX)/bin/tux_wifi_channel
+	rm /etc/udev/rules.d/45-tuxdroid.rules
+	rm /usr/share/applications/controlcenter.desktop
+	rm /usr/share/applications/updater.desktop
+	rm /usr/share/pixmaps/tuxcc.png
+	rm /usr/share/pixmaps/tuxupd.png
+	rm -r /etc/tuxdroid
+	echo Done.
+


Property changes on: software_suite_v2/tuxware/installers/unix/trunk/build_deps/tar/Makefile.amd64
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native