![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 15af2589ff791d4cfba9438117d5e867ced23f56..af75112a8a963ae494ea9fcca136e63e42fe9829 100755 (executable)
# Kees Cook
# Michael Wybrow
#
-# Copyright 2006
-# Licensed under GNU General Public License
+# Copyright (C) 2006-2007
+# Released under GNU GPL, read the file 'COPYING' for more information
#
############################################################
# User modifiable parameters
#----------------------------------------------------------
-# Configure flags
-CONFFLAGS="--disable-static --enable-shared --enable-osxapp"
-# Libraries prefix
+# Configure flags
+CONFFLAGS="--enable-osxapp"
+# Libraries prefix (Warning: NO trailing slash)
LIBPREFIX="/opt/local"
+# User name on Modevia
+MODEVIA_NAME=""
############################################################
\033[1mp,pack,package\033[0m
package Inkscape in a double clickable .app bundle
\033[1m-s,--strip\033[0m remove debugging information in Inkscape package
+ \033[1m-py,--with-python\033[0m specify python modules path for inclusion into the app bundle
\033[1md,dist,distrib\033[0m
store Inkscape.app in a disk image (dmg) for distribution
- \033[1m-py,--with-python\033[0m specify python packages path for inclusion into the dmg image
+ \033[1mput,upload\033[0m
+ upload the dmg and the associate info file on Modevia server
\033[1mall\033[0m
do everything (update, configure, build, install, package, distribute)
\033[1m$0 conf build install\033[0m
configure, build and install a dowloaded version of Inkscape in the default
directory, keeping debugging information.
- \033[1m$0 u a c b -p ~ i -s p -py ~/pyxml/ d\033[0m
+ \033[1m$0 u a c b -p ~ i -s -py ~/site-packages/ p d\033[0m
update an svn checkout, prepare configure script, configure,
build and install Inkscape in the user home directory (~).
- Then package Inkscape withouth debugging information,
- with python packages from ~/pyxml/ and prepare a dmg for
- distribution."
+ Then package Inkscape without debugging information,
+ with python packages from ~/site-packages/ and prepare
+ a dmg for distribution."
}
# Parameters
INSTALL="f"
PACKAGE="f"
DISTRIB="f"
+UPLOAD="f"
-STRIP="f"
-PYTHON="f"
+STRIP=""
+PYTHON_MODULES=""
# Parse command line options
#----------------------------------------------------------
exit 1 ;;
all)
SVNUPDATE="t"
- AUTOGEN="t"
CONFIGURE="t"
BUILD="t"
INSTALL="t"
PACKAGE="t" ;;
d|dist|distrib)
DISTRIB="t" ;;
+ put|upload)
+ UPLOAD="t" ;;
-p|--prefix)
INSTALLPREFIX=$2
shift 1 ;;
- -s|-strip)
- STRIP="t" ;;
+ -s|--strip)
+ STRIP="-s" ;;
-py|--with-python)
- PYTHON="t"
- PYTHONDIR="$2"
+ PYTHON_MODULES="$2"
shift 1 ;;
+ *)
+ echo "Invalid command line option: $1"
+ exit 2 ;;
esac
shift 1
done
export CPATH="$LIBPREFIX/include"
# configure search path
export CPPFLAGS="-I$LIBPREFIX/include"
+# export CPPFLAGS="-I$LIBPREFIX/include -I /System/Library/Frameworks/Carbon.framework/Versions/Current/Headers"
export LDFLAGS="-L$LIBPREFIX/lib"
# compiler arguments
export CFLAGS="-O3 -Wall"
export CXXFLAGS="$CFLAGS"
-# add X11 executables and libraries [does not seem to be required now]
-# export PATH="/usr/X11R6/bin:$PATH"
-# export LIBRARY_PATH="/usr/X11R6/lib:$LIBPREFIX/lib"
-# pkgconfig path [does not seem to be required either]
-# export PKG_CONFIG_PATH="$LIBPREFIX/lib/pkgconfig"
# Actions
cd $SRCROOT
if [ ! -f configure ]
then
- echo "Configure script not found in $SRCROOT. Run autogen.sh first"
+ echo "Configure script not found in $SRCROOT. Run '$0 autogen' first"
exit 1
fi
./configure $ALLCONFFLAGS
if [[ "$PACKAGE" == "t" ]]
then
- # Detect strip parameter
- if [[ "$STRIP" == "t" ]]; then
- STRIPPARAM="-s"
- else
- STRIPPARAM=""
- fi
-
# Test the existence of required files
if [ ! -e $INSTALLPREFIX/bin/inkscape ]
then
exit 1
fi
+ # Set python command line option (if PYTHON_MODULES location is not empty, then add the python call to the command line, otherwise, stay empty)
+ if [[ "$PYTHON_MODULES" != "" ]]; then
+ PYTHON_MODULES="-py $PYTHON_MODULES"
+ # TODO: fix this: it does not allow for spaces in the PATH under this form and cannot be quoted
+ fi
+
# Create app bundle
- ./osx-app.sh $STRIPPARAM $INSTALLPREFIX/bin/inkscape $SRCROOT/Info.plist
+ ./osx-app.sh $STRIP -b $INSTALLPREFIX/bin/inkscape -p $SRCROOT/Info.plist $PYTHON_MODULES
status=$?
if [[ $status -ne 0 ]]; then
echo -e "\nApplication bundle creation failed"
fi
fi
-if [[ "$DISTRIB" == "t" ]]
-then
- REVISION=`head -n 4 ../../.svn/entries | tail -n 1`
- ARCH=`arch | tr [p,c] [P,C]`
- NEWNAME="Inkscape-$REVISION-$ARCH"
- DMGFILE="$NEWNAME.dmg"
- INFOFILE="$NEWNAME-info.txt"
+# Fetch some information
+REVISION=`head -n 4 ../../.svn/entries | tail -n 1`
+ARCH=`arch | tr [p,c] [P,C]`
+MINORVERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d \.`
+NEWNAME="Inkscape-$REVISION-10.$MINORVERSION-$ARCH"
+DMGFILE="$NEWNAME.dmg"
+INFOFILE="$NEWNAME-info.txt"
+if [[ "$DISTRIB" == "t" ]]
+then
# Create dmg bundle
- if [[ "$PYTHON" == "t" ]]; then
- ./osx-dmg.sh -py "$PYTHONDIR"
- else
- ./osx-dmg.sh
- fi
+ ./osx-dmg.sh -p "Inkscape.app"
status=$?
if [[ $status -ne 0 ]]; then
echo -e "\nDisk image creation failed"
# Prepare information file
echo "Version information on $DATE for `whoami`:
- OS X `/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d \:`
+ OS X `/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d \:`
Architecture $ARCH
DarwinPorts `port version | cut -f2 -d \ `
GCC `gcc --version | grep GCC`
else
echo "Debug info
yes" >> $INFOFILE
+ fi
+fi
+
+if [[ "$UPLOAD" == "t" ]]
+then
+ # Provide default for user name on modevia
+ if [[ "$MODEVIA_NAME" == "" ]]; then
+ MODEVIA_NAME=$USER
fi
-
- # open a Finder window here
+ # Uploasd file
+ scp $DMGFILE $INFOFILE "$MODEVIA_NAME"@inkscape.modevia.com:inkscape/docs/macosx-snap/
+ status=$?
+ if [[ $status -ne 0 ]]; then
+ echo -e "\nUpload failed"
+ exit $status
+ fi
+fi
+
+if [[ "$PACKAGE" == "t" || "$DISTRIB" == "t" ]]; then
+ # open a Finder window here to admire what we just produced
open .
fi