Author: ks156
Date: 2009-02-12 10:05:02 +0100 (Thu, 12 Feb 2009)
New Revision: 3615
Modified:
software_suite_v2/tuxware/installers/unix/branches/separate_packages/build.sh
Log:
* Moved all the directory creation into the functions. All functions should now
be able to create its directories.
The behavior still the same as the trunk.
Modified:
software_suite_v2/tuxware/installers/unix/branches/separate_packages/build.sh
===================================================================
---
software_suite_v2/tuxware/installers/unix/branches/separate_packages/build.sh
2009-02-11 23:48:37 UTC (rev 3614)
+++
software_suite_v2/tuxware/installers/unix/branches/separate_packages/build.sh
2009-02-12 09:05:02 UTC (rev 3615)
@@ -110,6 +110,17 @@
mkdir $BUILD_DIR
}
+createMirror () {
+ mkdir -p $MIRROR_DIR/
+ mkdir -p $MIRROR_DIR/$PREFIX
+ mkdir -p $MIRROR_DIR/$PREFIX/$SHARE_ROOT
+
+ echo "======== Versions included ========">$MIRROR_DIR/$PREFIX/$VER_FILE
+ SVN_REV=`svn info http://svn.tuxisalive.com -r HEAD |grep Revision`
+ echo "$VERSION (SVN $SVN_REV)" >> $MIRROR_DIR/$PREFIX/$VER_FILE
+ echo "" >> $MIRROR_DIR/$PREFIX/$VER_FILE
+}
+
# Create /etc
createEtcDir () {
echo Creating /etc directory
@@ -138,52 +149,14 @@
mkdir -p $MIRROR_DIR/usr
}
-# Create the $PREFIX dir
-createBaseDir () {
- echo "Creating base directory"
- mkdir -p $BUILD_DIR
- mkdir -p $MIRROR_DIR
- mkdir -p $MIRROR_DIR/$PREFIX
- mkdir -p $MIRROR_DIR/$PREFIX/$BIN_DIR
- mkdir -p $MIRROR_DIR/$PREFIX/$LIB_DIR
- mkdir -p $MIRROR_DIR/$PREFIX/$LIB_ACAP
- mkdir -p $MIRROR_DIR/$PREFIX/$LIB_JAVA_API
- mkdir -p $MIRROR_DIR/$PREFIX/$LIB_PYTHON_API
- mkdir -p $MIRROR_DIR/$PREFIX/$SHARE_DIR
- mkdir -p $MIRROR_DIR/$PREFIX/$SHARE_ROOT
- mkdir -p $MIRROR_DIR/$PREFIX/$SERVER_DIR
- mkdir -p $MIRROR_DIR/$PREFIX/$UPDATER_DIR
- mkdir -p $MIRROR_DIR/$PREFIX/$FIRMWARE_DIR
- mkdir -p $MIRROR_DIR/$PREFIX/$DOC_ROOT_DIR
- mkdir -p $MIRROR_DIR/$PREFIX/$EXAMPLES_DIR
- mkdir -p $MIRROR_DIR/$PREFIX/$PYTHON_DOC_DIR
- mkdir -p $MIRROR_DIR/$PREFIX/$JAVA_DOC_DIR
- mkdir -p $MIRROR_DIR/$PREFIX/$RESSOURCES_ROOT_DIR
- mkdir -p $MIRROR_DIR/$PREFIX/$TOOLS_DIR
- mkdir -p $MIRROR_DIR/$PREFIX/$GADGETS_DIR
- mkdir -p $MIRROR_DIR/$PREFIX/$ATTITUNES_DIR
- mkdir -p $MIRROR_DIR/$PREFIX/$HELP_DIR
- mkdir -p $MIRROR_DIR/$PREFIX/$CC_DIR
- mkdir -p $MIRROR_DIR/$PREFIX/$MISC_DIR
- mkdir -p $MIRROR_DIR/$PREFIX/$TEMPLATES_DIR
- mkdir -p $MIRROR_DIR/$PREFIX/$CC_DEPS_DIR
- mkdir -p $MIRROR_DIR/$PREFIX/$SOUND_DIR
- mkdir -p $MIRROR_DIR/$PREFIX/$PIXMAP_DIR
- mkdir -p $MIRROR_DIR/opt
- mkdir -p $MIRROR_DIR/opt/Acapela
- mkdir -p $MIRROR_DIR/opt/Acapela/TelecomTTS
- mkdir -p $MIRROR_DIR/opt/Acapela/TelecomTTS/babtts
-
- echo "======== Versions included ========">$MIRROR_DIR/$PREFIX/$VER_FILE
- SVN_REV=`svn info http://svn.tuxisalive.com -r HEAD |grep Revision`
- echo "$VERSION (SVN $SVN_REV)" >> $MIRROR_DIR/$PREFIX/$VER_FILE
- echo "" >> $MIRROR_DIR/$PREFIX/$VER_FILE
-}
# Install the server from SVN
packServer () {
echo "-- Copying the server from SVN"
echo "Server version : " >> $MIRROR_DIR/$PREFIX/$VER_FILE
+
+ mkdir -p $MIRROR_DIR/$PREFIX/$SERVER_DIR
+
if [ $SOURCE != $QC ]; then
listServer
http://svn.tuxisalive.com/software_suite_v2/tuxware/tuxhttpserver
else
@@ -205,6 +178,10 @@
packPythAPI () {
echo "-- Copying the python API"
echo "Python API version : " >> $MIRROR_DIR/$PREFIX/$VER_FILE
+
+ mkdir -p $MIRROR_DIR/$PREFIX/$LIB_PYTHON_API
+ mkdir -p $MIRROR_DIR/$PREFIX/$MISC_DIR
+
if [ $SOURCE != $QC ]; then
listServer
http://svn.tuxisalive.com/software_suite_v2/tuxware/pytuxisalive
else
@@ -244,6 +221,9 @@
# Compile the driver from SVN
compileDriver () {
+
+ mkdir -p $MIRROR_DIR/$PREFIX/$LIB_PYTHON_API/tuxisalive/
+
svn export -q --force \
http://svn.tuxisalive.com/software_suite_v2/tuxware/tuxdriver/trunk
/tmp/tuxdriver
cd /tmp/tuxdriver/unix
@@ -257,6 +237,9 @@
compTuxup () {
echo "-- Compiling tuxup"
echo "Tuxup version : " >> $MIRROR_DIR/$PREFIX/$VER_FILE
+
+ mkdir -p $MIRROR_DIR/$PREFIX/$BIN_DIR
+
if [ $SOURCE != $QC ]; then
listServer http://svn.tuxisalive.com/firmware/tuxup/unix NONE
else
@@ -276,6 +259,9 @@
}
compDfuProgrammer () {
+
+ mkdir -p $MIRROR_DIR/$PREFIX/$BIN_DIR/
+
wget \
http://dfn.dl.sourceforge.net/sourceforge/dfu-programmer/dfu-programmer-0.4.6.tar.gz\
-O /tmp/dfu.tar.gz
@@ -291,6 +277,9 @@
packFirmwares () {
echo "-- Packing firmwares"
echo "Firmwares version : " >> $MIRROR_DIR/$PREFIX/$VER_FILE
+
+ mkdir -p $MIRROR_DIR/$PREFIX/$FIRMWARE_DIR
+
listServer http://svn.tuxisalive.com/firmware/hex
svn export -q --force \
http://svn.tuxisalive.com/firmware/hex/$__URL \
@@ -302,6 +291,9 @@
wifiAvoidance () {
echo "-- Compiling the wifi avoidance software"
mkdir tmp
+
+ mkdir -p $MIRROR_DIR/$PREFIX/$BIN_DIR
+
svn export -q --force \
http://svn.tuxisalive.com/software_suite_v2/software/tux_wifi_channel/trunk tmp
cd tmp
@@ -315,6 +307,9 @@
packIdleBehavior () {
echo "Packing Idle Behavior"
mkdir /tmp/idle_behavior
+
+ mkdir -p $MIRROR_DIR/$PREFIX/$SERVER_DIR/resources
+
svn export -q --force \
http://svn.tuxisalive.com/software_suite_v2/software/http_server_resources/idle_behavior/trunk
/tmp/idle_behavior
cp /tmp/idle_behavior/ResourceTuxIdle.py
$MIRROR_DIR/$PREFIX/$SERVER_DIR/resources
@@ -326,15 +321,17 @@
packChatterTux () {
echo "Packing Chatter Tux"
mkdir /tmp/chattertux
+
+ mkdir -p $MIRROR_DIR/$PREFIX/$ATTITUNES_DIR/chatterTux
+ mkdir -p $MIRROR_DIR/$PREFIX/$SERVER_DIR/chatterTux
+ mkdir -p $MIRROR_DIR/$PREFIX/$SERVER_DIR/chatterTux
+ mkdir -p $MIRROR_DIR/$PREFIX/$SERVER_DIR/resources
+
svn export -q --force \
http://svn.tuxisalive.com/software_suite_v2/software/http_server_resources/chatter_tux/trunk
/tmp/chattertux
cp /tmp/chattertux/HTTPRessource/ResourceChatterTux.py
$MIRROR_DIR/$PREFIX/$SERVER_DIR/resources
- mkdir -p $MIRROR_DIR/$PREFIX/$SERVER_DIR/chatterTux
cp /tmp/chattertux/ChatterTux/chattertux.py
$MIRROR_DIR/$PREFIX/$SERVER_DIR/chatterTux
- #cp /tmp/chattertux/ChatterTuxStart/chattertux_start
$MIRROR_DIR/$PREFIX/$SERVER_DIR/chatterTux
- #cp /tmp/chattertux/ChatterTuxStop/chattertux_stop
$MIRROR_DIR/$PREFIX/$SERVER_DIR/chatterTux
chmod +x $MIRROR_DIR/$PREFIX/$SERVER_DIR/chatterTux/*
- mkdir -p $MIRROR_DIR/$PREFIX/$ATTITUNES_DIR/chatterTux
cp /tmp/chattertux/att/* $MIRROR_DIR/$PREFIX/$ATTITUNES_DIR/chatterTux
cp /tmp/chattertux/wav/* $MIRROR_DIR/$PREFIX/$ATTITUNES_DIR/chatterTux
rm -r /tmp/chattertux
@@ -343,6 +340,9 @@
packSounds () {
echo "-- Copying the internal sounds"
+
+ mkdir -p $MIRROR_DIR/$PREFIX/$SOUND_DIR
+
svn export -q --force \
http://svn.tuxisalive.com/software_suite_v1/software/tuxgi/trunk/sounds/ \
$MIRROR_DIR/$PREFIX/$SOUND_DIR
@@ -351,6 +351,9 @@
# Install the updater from local FS
packUpdater () {
echo "-- Copying the gadget updater"
+
+ mkdir -p $MIRROR_DIR/$PREFIX/$UPDATER_DIR
+
sed "s;PREFIX=;PREFIX=$PREFIX;g" build_deps/common/updater/tux_updater\
>$MIRROR_DIR/$PREFIX/$UPDATER_DIR/tux_updater
cp getRules.py $MIRROR_DIR/$PREFIX/$UPDATER_DIR
@@ -359,6 +362,9 @@
# Create tuxsh binary
tuxshBin () {
echo "-- Creating tuxsh"
+
+ mkdir -p $MIRROR_DIR/$PREFIX/$BIN_DIR/
+
echo "#!/bin/bash" >$MIRROR_DIR/$PREFIX/$BIN_DIR/tuxsh
echo "python -i /usr/share/tuxdroid/resources/misc/sh.py" \
>> $MIRROR_DIR/$PREFIX/$BIN_DIR/tuxsh
@@ -368,6 +374,9 @@
# Create the server binary
serverBin () {
echo "-- Creating server binary"
+
+ mkdir -p $MIRROR_DIR/$PREFIX/$BIN_DIR/
+
echo "#!/bin/bash" >$MIRROR_DIR/$PREFIX/$BIN_DIR/tuxhttpserver
echo "python $PREFIX/$SERVER_DIR/tuxhttpserver.py" >> \
$MIRROR_DIR/$PREFIX/$BIN_DIR/tuxhttpserver
@@ -377,6 +386,9 @@
# Create the control center binary
ccBin () {
echo "-- Creating control center binary"
+
+ mkdir -p $MIRROR_DIR/$PREFIX/$BIN_DIR/
+
echo "#!/bin/bash" >$MIRROR_DIR/$PREFIX/$BIN_DIR/tux_control_center
echo "java -jar $PREFIX/$CC_DIR/controlcenter.jar \$*" >> \
$MIRROR_DIR/$PREFIX/$BIN_DIR/tux_control_center
@@ -386,6 +398,9 @@
# Create the updater binary
updaterBin () {
echo "-- Creating tux_updater binary"
+
+ mkdir -p $MIRROR_DIR/$PREFIX/$BIN_DIR/
+
echo "#!/bin/bash" >$MIRROR_DIR/$PREFIX/$BIN_DIR/tux_updater
echo "source $PREFIX/$UPDATER_DIR/tux_updater" >> \
$MIRROR_DIR/$PREFIX/$BIN_DIR/tux_updater
@@ -398,7 +413,6 @@
wget -q $url -O /tmp/$file
unzip -q /tmp/$file -d /tmp/tux_tmp
rm /tmp/$file
- #file=${file##.*}
if [ ! -d $MIRROR_DIR/$path ]; then
mkdir -p $MIRROR_DIR/$path
fi
@@ -724,7 +738,8 @@
createTemp
createUsrDir
createEtcDir
-createBaseDir
+createMirror
+
# <--- Download stuff from SVN --->
packServer
packPythAPI
@@ -758,4 +773,4 @@
esac
clean
-packChatterPlugin
+#packChatterPlugin
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
