GNOME.org
 

ooo-build r14999 - in trunk: . bin/piece

Author: rengelhard
Date: Mon Jan  5 20:54:35 2009
New Revision: 14999
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14999&view=rev

Log:
2009-01-05  Rene Engelhard  <rene debian org>

        * bin/piece: basis3.0 -> basis$VERSION


Modified:
   trunk/ChangeLog
   trunk/bin/piece/file-list-calc
   trunk/bin/piece/file-list-components
   trunk/bin/piece/file-list-help
   trunk/bin/piece/file-list-impress
   trunk/bin/piece/file-list-l10n
   trunk/bin/piece/file-list-libs_core
   trunk/bin/piece/file-list-libs_extern
   trunk/bin/piece/file-list-libs_gui
   trunk/bin/piece/file-list-ure
   trunk/bin/piece/file-list-writer
   trunk/bin/piece/install-generic
   trunk/bin/piece/install-registry
   trunk/bin/piece/post-inst-postprocess
   trunk/bin/piece/post-inst-ure
   trunk/bin/piece/save-noarch
   trunk/bin/piece/save-registry
   trunk/bin/piece/sys-setup.in

Modified: trunk/bin/piece/file-list-calc
==============================================================================
--- trunk/bin/piece/file-list-calc	(original)
+++ trunk/bin/piece/file-list-calc	Mon Jan  5 20:54:35 2009
@@ -12,4 +12,4 @@
 $OO_TOOLSDIR/piece/install-registry $piece $ooo_build_tag "$piece"
 
 # prune redundant files the scp2 likes to make for us
-remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis$VERSION/ure-link"

Modified: trunk/bin/piece/file-list-components
==============================================================================
--- trunk/bin/piece/file-list-components	(original)
+++ trunk/bin/piece/file-list-components	Mon Jan  5 20:54:35 2009
@@ -12,13 +12,13 @@
 $OO_TOOLSDIR/piece/merge-file-lists "files-$piece.txt" $DESTDIR/gid_*
 
 # officebean subpackage
-mv_file_between_flists files-officebean.txt files-$piece.txt $OO_INSTDIR/basis3.0/program/classes/officebean.jar
-mv_file_between_flists files-officebean.txt files-$piece.txt $OO_INSTDIR/basis3.0/program/libofficebean.so
+mv_file_between_flists files-officebean.txt files-$piece.txt $OO_INSTDIR/basis$VERSION/program/classes/officebean.jar
+mv_file_between_flists files-officebean.txt files-$piece.txt $OO_INSTDIR/basis$VERSION/program/libofficebean.so
 add_used_directories files-officebean.txt files-$piece.txt
 
 # prune redundant files the scp2 likes to make for us
 remove_file "files-$piece.txt" "$OO_INSTDIR/basis-link"
-remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis$VERSION/ure-link"
 remove_dir  "files-$piece.txt" "$OO_INSTDIR/ure"
 
 # solver is not in the file list, so rm is enough

Modified: trunk/bin/piece/file-list-help
==============================================================================
--- trunk/bin/piece/file-list-help	(original)
+++ trunk/bin/piece/file-list-help	Mon Jan  5 20:54:35 2009
@@ -11,9 +11,9 @@
 # put the rest into the common file list
 $OO_TOOLSDIR/piece/merge-file-lists "files-$piece.txt" $DESTDIR/gid_*
 # main_transform.xsl will be in l10n-extras
-remove_file "files-$piece.txt" $OO_INSTDIR/basis3.0/help/main_transform.xsl
+remove_file "files-$piece.txt" $OO_INSTDIR/basis$VERSION/help/main_transform.xsl
 # FIXME: hid.lst will be in testtool package (built in ?)
-remove_file "files-$piece.txt" $OO_INSTDIR/basis3.0/program/hid.lst
+remove_file "files-$piece.txt" $OO_INSTDIR/basis$VERSION/program/hid.lst
 # non-wanted mess
 remove_dir "files-$piece.txt" $OO_INSTDIR/ure
 

Modified: trunk/bin/piece/file-list-impress
==============================================================================
--- trunk/bin/piece/file-list-impress	(original)
+++ trunk/bin/piece/file-list-impress	Mon Jan  5 20:54:35 2009
@@ -17,4 +17,4 @@
 $OO_TOOLSDIR/piece/install-registry $piece $ooo_build_tag "draw"
 
 # prune redundant files the scp2 likes to make for us
-remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis$VERSION/ure-link"

Modified: trunk/bin/piece/file-list-l10n
==============================================================================
--- trunk/bin/piece/file-list-l10n	(original)
+++ trunk/bin/piece/file-list-l10n	Mon Jan  5 20:54:35 2009
@@ -8,14 +8,14 @@
 # generate the common file list
 $OO_TOOLSDIR/piece/merge-file-lists "files-$piece.txt" $DESTDIR/gid_*
 # install the common main_transform.xsl for the helpcontent
-mkdir -p $DESTDIR$OO_INSTDIR/basis3.0/help
-cp -a $OO_TOOLSDIR/../src/main_transform.xsl $DESTDIR$OO_INSTDIR/basis3.0/help
-echo "%dir $OO_INSTDIR/basis3.0/help" >>files-$piece.txt
-echo "$OO_INSTDIR/basis3.0/help/main_transform.xsl" >>files-$piece.txt
+mkdir -p $DESTDIR$OO_INSTDIR/basis$VERSION/help
+cp -a $OO_TOOLSDIR/../src/main_transform.xsl $DESTDIR$OO_INSTDIR/basis$VERSION/help
+echo "%dir $OO_INSTDIR/basis$VERSION/help" >>files-$piece.txt
+echo "$OO_INSTDIR/basis$VERSION/help/main_transform.xsl" >>files-$piece.txt
 
 # prune redundant files the scp2 likes to make for us
 remove_file "files-$piece.txt" "$OO_INSTDIR/basis-link"
-remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis$VERSION/ure-link"
 remove_dir  "files-$piece.txt" "$OO_INSTDIR/ure"
 
 # move the stuff to /usr/share when enabled

Modified: trunk/bin/piece/file-list-libs_core
==============================================================================
--- trunk/bin/piece/file-list-libs_core	(original)
+++ trunk/bin/piece/file-list-libs_core	Mon Jan  5 20:54:35 2009
@@ -22,28 +22,28 @@
 
 # fix up kde subpackage
 mv_file_between_flists files-kde.txt files-$piece.txt $OO_INSTDIR/program/kdefilepicker
-mv_file_between_flists files-kde.txt files-$piece.txt $OO_INSTDIR/basis3.0/program/fps_kde.uno.so
-mv_file_between_flists files-kde.txt files-$piece.txt $OO_INSTDIR/basis3.0/program/libvclplug_kde[0-9]*l..so
-mv_file_between_flists files-kde.txt files-$piece.txt $OO_INSTDIR/basis3.0/program/libkabdrv1.so
+mv_file_between_flists files-kde.txt files-$piece.txt $OO_INSTDIR/basis$VERSION/program/fps_kde.uno.so
+mv_file_between_flists files-kde.txt files-$piece.txt $OO_INSTDIR/basis$VERSION/program/libvclplug_kde[0-9]*l..so
+mv_file_between_flists files-kde.txt files-$piece.txt $OO_INSTDIR/basis$VERSION/program/libkabdrv1.so
 add_used_directories files-kde.txt files-$piece.txt
 	
 # fix up gnome subpackage
-mv_file_between_flists files-gnome.txt files-$piece.txt $OO_INSTDIR/basis3.0/program/libevoab2.so
-mv_file_between_flists files-gnome.txt files-$piece.txt $OO_INSTDIR/basis3.0/program/fps_gnome.uno.so
-mv_file_between_flists files-gnome.txt files-$piece.txt $OO_INSTDIR/basis3.0/program/libvclplug_gtk[0-9]*l..so
-mv_file_between_flists files-$piece.txt files-gnome.txt $OO_INSTDIR/basis3.0/program/ucpgvfs1.uno.so
+mv_file_between_flists files-gnome.txt files-$piece.txt $OO_INSTDIR/basis$VERSION/program/libevoab2.so
+mv_file_between_flists files-gnome.txt files-$piece.txt $OO_INSTDIR/basis$VERSION/program/fps_gnome.uno.so
+mv_file_between_flists files-gnome.txt files-$piece.txt $OO_INSTDIR/basis$VERSION/program/libvclplug_gtk[0-9]*l..so
+mv_file_between_flists files-$piece.txt files-gnome.txt $OO_INSTDIR/basis$VERSION/program/ucpgvfs1.uno.so
 add_used_directories files-gnome.txt files-$piece.txt
 
 # mailmerge subpackage
-mv_file_between_flists files-mailmerge.txt files-$piece.txt $OO_INSTDIR/basis3.0/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu
-mv_file_between_flists files-mailmerge.txt files-$piece.txt $OO_INSTDIR/basis3.0/program/mailmerge.py
+mv_file_between_flists files-mailmerge.txt files-$piece.txt $OO_INSTDIR/basis$VERSION/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu
+mv_file_between_flists files-mailmerge.txt files-$piece.txt $OO_INSTDIR/basis$VERSION/program/mailmerge.py
 add_used_directories files-mailmerge.txt files-$piece.txt
-chmod 755 $DESTDIR$OO_INSTDIR/basis3.0/program/mailmerge.py
+chmod 755 $DESTDIR$OO_INSTDIR/basis$VERSION/program/mailmerge.py
 
 # mess
 remove_file "files-$piece.txt" "$OO_INSTDIR/basis-link"
-remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"
-remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/program/services.rdb"
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis$VERSION/ure-link"
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis$VERSION/program/services.rdb"
 remove_dir  "files-$piece.txt" "$OO_INSTDIR/ure"
 
 exit 0

Modified: trunk/bin/piece/file-list-libs_extern
==============================================================================
--- trunk/bin/piece/file-list-libs_extern	(original)
+++ trunk/bin/piece/file-list-libs_extern	Mon Jan  5 20:54:35 2009
@@ -8,6 +8,6 @@
 $OO_TOOLSDIR/piece/merge-file-lists "files-$piece.txt" $DESTDIR/gid_*
 
 # prune redundant files the scp2 likes to make for us
-remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis$VERSION/ure-link"
 
 exit 0

Modified: trunk/bin/piece/file-list-libs_gui
==============================================================================
--- trunk/bin/piece/file-list-libs_gui	(original)
+++ trunk/bin/piece/file-list-libs_gui	Mon Jan  5 20:54:35 2009
@@ -9,7 +9,7 @@
 $OO_TOOLSDIR/piece/merge-file-lists "files-$piece.txt" $DESTDIR/gid_*
 
 remove_dir "files-$piece.txt" $OO_INSTDIR/basis-link
-remove_dir "files-$piece.txt" $OO_INSTDIR/basis3.0/ure-link
+remove_dir "files-$piece.txt" $OO_INSTDIR/basis$VERSION/ure-link
 remove_dir "files-$piece.txt" $OO_INSTDIR/ure
 
 exit 0

Modified: trunk/bin/piece/file-list-ure
==============================================================================
--- trunk/bin/piece/file-list-ure	(original)
+++ trunk/bin/piece/file-list-ure	Mon Jan  5 20:54:35 2009
@@ -16,9 +16,9 @@
 $OO_TOOLSDIR/piece/merge-file-lists "files-$piece.txt" $DESTDIR/gid_*
 
 # finalize mono subpackage
-mv_file_between_flists files-mono.txt files-$piece.txt $OO_INSTDIR/basis3.0/program/cli_.*.dll
-mv_file_between_flists files-mono.txt files-$piece.txt $OO_INSTDIR/basis3.0/program/cli_.*.dll.config
-mv_file_between_flists files-mono.txt files-$piece.txt $OO_INSTDIR/basis3.0/program/policy.*.cli_.*.dll
+mv_file_between_flists files-mono.txt files-$piece.txt $OO_INSTDIR/basis$VERSION/program/cli_.*.dll
+mv_file_between_flists files-mono.txt files-$piece.txt $OO_INSTDIR/basis$VERSION/program/cli_.*.dll.config
+mv_file_between_flists files-mono.txt files-$piece.txt $OO_INSTDIR/basis$VERSION/program/policy.*.cli_.*.dll
 mv_file_between_flists files-mono.txt files-$piece.txt $OO_INSTDIR/ure/lib/cli_.*.dll
 mv_file_between_flists files-mono.txt files-$piece.txt $OO_INSTDIR/ure/lib/cli_.*.dll.config
 mv_file_between_flists files-mono.txt files-$piece.txt $OO_INSTDIR/ure/lib/policy.*.cli_.*.dll
@@ -29,10 +29,10 @@
 #        it might be generated in postprocess togeter with other profiles but it is too late
 #        might be fixed by the planed scp2-split
 # IMPORTANT: the other variant generated in postprocess is explicitely removed in bin/piece/post-inst-postprocess
-cat <<EOT  >$DESTDIR$OO_INSTDIR/basis3.0/program/pythonloader.unorc
+cat <<EOT  >$DESTDIR$OO_INSTDIR/basis$VERSION/program/pythonloader.unorc
 [Bootstrap]
 PYUNO_LOADER_PYTHONPATH=\$ORIGIN
 EOT
-echo "%config $OO_INSTDIR/basis3.0/program/pythonloader.unorc" >>files-pyuno.txt
+echo "%config $OO_INSTDIR/basis$VERSION/program/pythonloader.unorc" >>files-pyuno.txt
 
 exit 0

Modified: trunk/bin/piece/file-list-writer
==============================================================================
--- trunk/bin/piece/file-list-writer	(original)
+++ trunk/bin/piece/file-list-writer	Mon Jan  5 20:54:35 2009
@@ -19,4 +19,4 @@
 $OO_TOOLSDIR/piece/install-registry $piece $ooo_build_tag "math"
 
 # prune redundant files the scp2 likes to make for us
-remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis$VERSION/ure-link"

Modified: trunk/bin/piece/install-generic
==============================================================================
--- trunk/bin/piece/install-generic	(original)
+++ trunk/bin/piece/install-generic	Mon Jan  5 20:54:35 2009
@@ -88,7 +88,7 @@
 echo "Fixing permissions of libraries..."
 for libdir in $OO_INSTDIR/ure/lib \
 	      $OO_INSTDIR/program \
-	      $OO_INSTDIR/basis3.0/program ; do
+	      $OO_INSTDIR/basis$VERSION/program ; do
     test -d $DESTDIR$libdir && \
 	find $DESTDIR$libdir -name '*.so*' -type f -exec chmod a+x {} \;
 done

Modified: trunk/bin/piece/install-registry
==============================================================================
--- trunk/bin/piece/install-registry	(original)
+++ trunk/bin/piece/install-registry	Mon Jan  5 20:54:35 2009
@@ -11,7 +11,7 @@
 
 echo "Installing $pack registry to the final location..."
 
-registry_system=$OO_INSTDIR/basis3.0/share/registry
+registry_system=$OO_INSTDIR/basis$VERSION/share/registry
 registry_solver=$OO_SOLVERDIR/registry
 filelist_prebuilt=files-$pack-registry.txt
 filelist_final=files-$pack.txt

Modified: trunk/bin/piece/post-inst-postprocess
==============================================================================
--- trunk/bin/piece/post-inst-postprocess	(original)
+++ trunk/bin/piece/post-inst-postprocess	Mon Jan  5 20:54:35 2009
@@ -27,21 +27,21 @@
 $OO_TOOLSDIR/piece/install-generic $piece $ooo_build_tag
 # urgh - unbelievably nasty:
 cp -a OpenOffice/gid_Starregistry_Services_Rdb_rdb/*/services.rdb \
-    $DESTDIR$OO_INSTDIR/basis3.0/program/services.rdb
+    $DESTDIR$OO_INSTDIR/basis$VERSION/program/services.rdb
 cp -a OpenOffice/gid_Starregistry_Services_Rdb_Ure_servicesrdb/*/services.rdb \
     $DESTDIR$OO_INSTDIR/ure/share/misc/services.rdb
 # udpate the file list
 if test -f "files-$piece.txt" ; then
-    echo "$OO_INSTDIR/basis3.0/program/services.rdb" >>"files-$piece.txt"
+    echo "$OO_INSTDIR/basis$VERSION/program/services.rdb" >>"files-$piece.txt"
     echo "$OO_INSTDIR/ure/share/misc/services.rdb" >>"files-$piece.txt"
 fi
 
 # FIXME: remove pythonloader.unorc
 #        it has been already generated by bin/piece/file-list-ure
-remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/program/pythonloader.unorc"
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis$VERSION/program/pythonloader.unorc"
 
 # prune redundant files the scp2 likes to make for us
-remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis$VERSION/ure-link"
 
 # no need for solver bits at this late stage
 rm -Rf "$DESTDIR/$OO_INSTDIR/solver"

Modified: trunk/bin/piece/post-inst-ure
==============================================================================
--- trunk/bin/piece/post-inst-ure	(original)
+++ trunk/bin/piece/post-inst-ure	Mon Jan  5 20:54:35 2009
@@ -7,13 +7,13 @@
 
 if test "$OOO_BUILD_NOARCH" = "YES" ; then
     # create the base directories in /usr/share
-    mkdir -p $DESTDIR/$OO_INSTDIR_SHARE/basis3.0
-    ln -sf basis3.0 $DESTDIR/$OO_INSTDIR_SHARE/basis-link
+    mkdir -p $DESTDIR/$OO_INSTDIR_SHARE/basis$VERSION
+    ln -sf basis$VERSION $DESTDIR/$OO_INSTDIR_SHARE/basis-link
     # install a helper script to link the noarch stuff from /usr/share to /usr/lib
     cp -a $OO_TOOLSDIR/piece/link-to-ooo-home $DESTDIR/$OO_INSTDIR_SHARE
     if test -f "files-$piece.txt" ; then
 	echo "%dir $OO_INSTDIR_SHARE" >>"files-$piece.txt"
-	echo "%dir $OO_INSTDIR_SHARE/basis3.0" >>"files-$piece.txt"
+	echo "%dir $OO_INSTDIR_SHARE/basis$VERSION" >>"files-$piece.txt"
 	echo "$OO_INSTDIR_SHARE/basis-link" >>"files-$piece.txt"
 	echo "$OO_INSTDIR_SHARE/link-to-ooo-home" >>"files-$piece.txt"
     fi

Modified: trunk/bin/piece/save-noarch
==============================================================================
--- trunk/bin/piece/save-noarch	(original)
+++ trunk/bin/piece/save-noarch	Mon Jan  5 20:54:35 2009
@@ -29,11 +29,11 @@
 # FIXME: make me it optional?; allow move them to the common dir?
 for list in $DESTDIR/gid_Module_Langpack_Basis_* ; do
     test -f $list || continue;
-    for file in `sort -u $list | grep "$OO_INSTDIR/basis3.0/share/template/[-_[:alnum:]]*/layout/lyt-.*$"` ; do
+    for file in `sort -u $list | grep "$OO_INSTDIR/basis$VERSION/share/template/[-_[:alnum:]]*/layout/lyt-.*$"` ; do
 	echo "Warning: removing unwanted: $file"
 	rm $DESTDIR$file
     done
-    sed "s|$OO_INSTDIR/basis3.0/share/template/[-_[:alnum:]]*/layout/lyt-.*$||" $list >$list.new
+    sed "s|$OO_INSTDIR/basis$VERSION/share/template/[-_[:alnum:]]*/layout/lyt-.*$||" $list >$list.new
     mv $list.new $list
 done
 

Modified: trunk/bin/piece/save-registry
==============================================================================
--- trunk/bin/piece/save-registry	(original)
+++ trunk/bin/piece/save-registry	Mon Jan  5 20:54:35 2009
@@ -13,7 +13,7 @@
 
 echo "Saving prebuilt registry files for optional packages back into solver ..."
 
-registry_system=$OO_INSTDIR/basis3.0/share/registry
+registry_system=$OO_INSTDIR/basis$VERSION/share/registry
 registry_solver=$OO_SOLVERDIR/registry
 
 mkdir -p $DESTDIR/$registry_solver

Modified: trunk/bin/piece/sys-setup.in
==============================================================================
--- trunk/bin/piece/sys-setup.in	(original)
+++ trunk/bin/piece/sys-setup.in	Mon Jan  5 20:54:35 2009
@@ -24,7 +24,7 @@
 
 # installed system libraries
 URE_DIR=$OO_INSTDIR/ure
-BASIS_DIR=$OO_INSTDIR/basis3.0
+BASIS_DIR=$OO_INSTDIR/basis$VERSION
 INSTALL_DIR=$BASIS_DIR/program
 DEV_DIR=$OO_SOLVERDIR
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]