ooo-build r15134 - in branches/ooo-build-3-0-1: . bin src/layout

[pmladek svn gnome org]

Author: pmladek
Date: Thu Jan 22 17:24:55 2009
New Revision: 15134
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15134&view=rev

Log:
2009-01-22  Petr Mladek  <pmladek suse cz>

	* bin/java-set-classpath.in: fix for the 3-layer system

	* src/layout/Makefile.am: pack the layout icons to the released tarball




Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/bin/java-set-classpath.in
   branches/ooo-build-3-0-1/src/layout/Makefile.am

Modified: branches/ooo-build-3-0-1/bin/java-set-classpath.in
==============================================================================
--- branches/ooo-build-3-0-1/bin/java-set-classpath.in	(original)
+++ branches/ooo-build-3-0-1/bin/java-set-classpath.in	Thu Jan 22 17:24:55 2009
@@ -36,7 +36,7 @@
     exit 0;
 fi
 
-JVM_CONFIG_FILE= OOINSTBASE@/program/jvmfwk3rc
+JVM_CONFIG_FILE= OOINSTBASE@/basis-link/program/fundamentalbasisrc
 
 for path in $@ ; do
     if test "z${path%%/*}" != "z" ; then
@@ -45,19 +45,19 @@
     fi
     if test -e $path ; then
 	# the file exist
-	grep "UNO_JAVA_JFW_CLASSPATH_URLS.*file:/*$path\([[:space:]].*\)\?$" $JVM_CONFIG_FILE >/dev/null && continue
+	grep "URE_MORE_JAVA_CLASSPATH_URLS.*file:/*$path\([[:space:]].*\)\?$" $JVM_CONFIG_FILE >/dev/null && continue
 	# it is not registered
 	TMP_FILE=`mktemp /tmp/ooset-java-class.XXXXXXXXXX` || exit 1
- 	sed -e "s|^\(.*UNO_JAVA_JFW_CLASSPATH_URLS.*\)$|\1 file:$path|" $JVM_CONFIG_FILE >$TMP_FILE
+ 	sed -e "s|^\(.*URE_MORE_JAVA_CLASSPATH_URLS.*\)$|\1 file:$path|" $JVM_CONFIG_FILE >$TMP_FILE
 	mv -f $TMP_FILE $JVM_CONFIG_FILE
 	chmod 644 $JVM_CONFIG_FILE
     else
 	# the file does not exist, remove it from the configuration
 	TMP_FILE=`mktemp /tmp/ooset-java-class.XXXXXXXXXX` || exit 1;
-	sed -e "s|^\(.*UNO_JAVA_JFW_CLASSPATH_URLS.*\)file:/*$path\([[:space:]].*\)\?$|\1\2|" \
-	    -e "s/\(UNO_JAVA_JFW_CLASSPATH_URLS=\)[[:space:]]\+/\1/" \
-	    -e "/^.*UNO_JAVA_JFW_CLASSPATH_URLS/s/[[:space:]]\+/ /g" \
-	    -e "/^.*UNO_JAVA_JFW_CLASSPATH_URLS/s/[[:space:]]*$//" $JVM_CONFIG_FILE >$TMP_FILE
+	sed -e "s|^\(.*URE_MORE_JAVA_CLASSPATH_URLS.*\)file:/*$path\([[:space:]].*\)\?$|\1\2|" \
+	    -e "s/\(URE_MORE_JAVA_CLASSPATH_URLS=\)[[:space:]]\+/\1/" \
+	    -e "/^.*URE_MORE_JAVA_CLASSPATH_URLS/s/[[:space:]]\+/ /g" \
+	    -e "/^.*URE_MORE_JAVA_CLASSPATH_URLS/s/[[:space:]]*$//" $JVM_CONFIG_FILE >$TMP_FILE
 	mv -f $TMP_FILE $JVM_CONFIG_FILE
 	chmod 644 $JVM_CONFIG_FILE
     fi

Modified: branches/ooo-build-3-0-1/src/layout/Makefile.am
==============================================================================
--- branches/ooo-build-3-0-1/src/layout/Makefile.am	(original)
+++ branches/ooo-build-3-0-1/src/layout/Makefile.am	Thu Jan 22 17:24:55 2009
@@ -1 +1,4 @@
-EXTRA_DIST = README $(wildcard *.png)
+EXTRA_DIST = README $(wildcard *.png) default_images ooo_custom_images
+
+dist-hook:
+	rm -rf `find $(distdir)/src/layout -name .svn`