Changeset 28194

Timestamp:

2013-08-30T17:25:47+12:00 (11 years ago)

Author:

davidb

Message:

Changes necessary to move version of subversion used to 1.8.1

Location:

gs2-extensions/subversion/trunk/src/packages

Files:

• CASCADE-MAKE.sh (modified) (1 diff)
• CASCADE-MAKE/LIBXML.sh (added)
• CASCADE-MAKE/SERF.sh (modified) (2 diffs)
• CASCADE-MAKE/SQLITE.sh (modified) (2 diffs)
• CASCADE-MAKE/SUBVERSION.sh (modified) (2 diffs)
• gs-libxml2-2.9.0.tar.gz (added)
• neon-0.28.6.tar.gz (deleted)
• scons-local-2.3.0.tar.gz (added)
• serf-0.3.0.tar.gz (deleted)
• serf-1.3.1.tar.bz2 (added)
• sqlite-3.7.17.tar.gz (added)
• sqlite-3.7.2.tar.gz (deleted)
• subversion-1.6.13.tar.gz (deleted)
• subversion-1.8.1.tar.gz (added)

gs2-extensions/subversion/trunk/src/packages/CASCADE-MAKE.sh

@@ -2 +2 @@
 
 
-for d in APR SQLITE APRUTIL OPENSSL SERF NEON ZLIB SUBVERSION ; do
+for d in LIBXML APR SQLITE APRUTIL OPENSSL SERF ZLIB SUBVERSION ; do
   echo "    Running CASCADE-MAKE/$d.sh $*"
 

gs2-extensions/subversion/trunk/src/packages/CASCADE-MAKE/SERF.sh

@@ -2 +2 @@
 
 package=serf
-version=-0.3.0
+version=-1.3.1
 
 progname=$0
@@ -10 +10 @@
 prefix=$GEXTSVN_INSTALLED
 
-export CFLAGS="-fPIC -I$prefix/include $CFLAGS"
-export CXXFLAGS="-fPIC -I$prefix/include $CXXFLAGS"
-export CPPFLAGS="-fPIC -I$prefix/include $CPPFLAGS"
-export LDFLAGS="-L$prefix/lib $LDFLAGS"
+#export CFLAGS="-fPIC -I$prefix/include $CFLAGS"
+#export CXXFLAGS="-fPIC -I$prefix/include $CXXFLAGS"
+#export CPPFLAGS="-fPIC -I$prefix/include $CPPFLAGS"
+#export LDFLAGS="-L$prefix/lib $LDFLAGS"
 
-opt_run_untar $force_untar $auto_untar $package $version
-opt_run_configure $force_config $auto_config $package $version $prefix
+opt_run_untar $force_untar $auto_untar $package $version .tar.bz2
+if [ ! -f $package$version/scons.py ] ; then
+  /bin/cp scons-local-2.3.0.tar.gz $package$version/. \
+  && (cd $package$version ; tar xvzf scons-local-2.3.0.tar.gz )
+fi
 
-opt_run_make $compile   $package $version
-opt_run_make $install   $package $version "install"
-opt_run_make $clean     $package $version "clean"
+#opt_run_configure $force_config $auto_config $package $version $prefix
+
+#opt_run_make $compile   $package $version
+if [ $compile = 1 ] ; then
+  (cd $package$version ; ./scons.py APR=$prefix APU=$prefix OPENSSL=$prefix PREFIX=$prefix)
+fi
+
+#opt_run_make $install   $package $version "install"
+if [ $compile = 1 ] ; then
+  (cd $package$version ; ./scons.py install)
+fi
+
+#opt_run_make $clean     $package $version "clean"
+if [ $compile = 1 ] ; then
+  (cd $package$version ; ./scons.py -c)
+fi
+
+
 opt_run_make $distclean $package $version "distclean"
 

gs2-extensions/subversion/trunk/src/packages/CASCADE-MAKE/SQLITE.sh

@@ -2 +2 @@
 
 package=sqlite
-version=-3.7.2
+version=-3.7.17
 
 progname=$0
@@ -11 +11 @@
 
 opt_run_untar $force_untar $auto_untar $package $version
-opt_run_configure $force_config $auto_config $package $version $prefix
+opt_run_configure $force_config $auto_config $package $version $prefix --disable-tcl
 
 opt_run_make $compile   $package $version

gs2-extensions/subversion/trunk/src/packages/CASCADE-MAKE/SUBVERSION.sh

@@ -2 +2 @@
 
 package=subversion
-version=-1.6.13
+version=-1.8.1
 
 progname=$0
@@ -16 +16 @@
 
 opt_run_untar $force_untar $auto_untar $package $version
-opt_run_configure $force_config $auto_config $package $version $prefix --with-sqlite=$prefix
+opt_run_configure $force_config $auto_config $package $version $prefix \
+  --with-sqlite=$prefix \
+  --with-serf=$prefix
 
 opt_run_make $compile   $package $version