[Libreoffice-commits] .: bin/distro-install-clean-up bin/distro-install-desktop-integration bin/distro-install-file-lists bin/distro-install-sdk
bin/distro-install-clean-up|8 +++-
bin/distro-install-desktop-integration |8 +++-
bin/distro-install-file-lists |8 +++-
bin/distro-install-sdk |8 +++-
4 files changed, 28 insertions(+), 4 deletions(-)
New commits:
commit a0238fda86e18f8a282f9307bd6b201f97f5f331
Author: Petr Mladek
Date: Wed Feb 29 20:26:13 2012 +0100
bin/distro-install*: source config_host.mk instead of Env.Host.sh
thanks Stefan Bergman for improving the sed pattern
diff --git a/bin/distro-install-clean-up b/bin/distro-install-clean-up
index 98fb546..54dd1f3 100755
--- a/bin/distro-install-clean-up
+++ b/bin/distro-install-clean-up
@@ -1,6 +1,12 @@
#!/bin/sh
-. ./*[Ee]nv.[Hh]ost.sh
+if test -z "${SRC_ROOT}"; then
+eval $(sed -e s/\'/\'\'\'/g -e 's/=\(.\+\)/='\''\1'\'/
./config_host.mk)
+fi
+if test -z "${SOLARENV}"; then
+echo "distro-install-clean-up: No environment set!"
+exit 1
+fi
echo "Cleaning up ...";
diff --git a/bin/distro-install-desktop-integration
b/bin/distro-install-desktop-integration
index 6e45285..c7f58ee 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -1,6 +1,12 @@
#!/bin/sh
-. ./*[Ee]nv.[Hh]ost.sh
+if test -z "${SRC_ROOT}"; then
+eval $(sed -e s/\'/\'\'\'/g -e 's/=\(.\+\)/='\''\1'\'/
./config_host.mk)
+fi
+if test -z "${SOLARENV}"; then
+echo "distro-install-clean-up: No environment set!"
+exit 1
+fi
PRODUCTVERSION_NODOT=`echo $PRODUCTVERSION | sed -e "s/\.//"`
diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index 7282a67..0f6e60a 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -1,6 +1,12 @@
#!/bin/sh
-. ./*[Ee]nv.[Hh]ost.sh
+if test -z "${SRC_ROOT}"; then
+eval $(sed -e s/\'/\'\'\'/g -e 's/=\(.\+\)/='\''\1'\'/
./config_host.mk)
+fi
+if test -z "${SOLARENV}"; then
+echo "distro-install-clean-up: No environment set!"
+exit 1
+fi
BUILDDIR=`pwd`
FILELISTSDIR="$BUILDDIR/file-lists"
diff --git a/bin/distro-install-sdk b/bin/distro-install-sdk
index 09c75c6..f1cb6fe 100755
--- a/bin/distro-install-sdk
+++ b/bin/distro-install-sdk
@@ -1,6 +1,12 @@
#!/bin/sh
-. ./*[Ee]nv.[Hh]ost.sh
+if test -z "${SRC_ROOT}"; then
+eval $(sed -e s/\'/\'\'\'/g -e 's/=\(.\+\)/='\''\1'\'/
./config_host.mk)
+fi
+if test -z "${SOLARENV}"; then
+echo "distro-install-clean-up: No environment set!"
+exit 1
+fi
if test -d $DESTDIR$INSTALLDIR/sdk ; then
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bin/distro-install-clean-up bin/distro-install-desktop-integration bin/distro-install-file-lists bin/distro-install-sdk
bin/distro-install-clean-up|2
bin/distro-install-desktop-integration |8 +-
bin/distro-install-file-lists | 130 -
bin/distro-install-sdk | 72 +-
4 files changed, 106 insertions(+), 106 deletions(-)
New commits:
commit 8326efcbb46d423958f5b4bf86941ce30c3639be
Author: Tomas Chvatal
Date: Mon Nov 14 15:07:15 2011 +0100
Remove basisVERSION from distro scripts as it is not used anymore.
diff --git a/bin/distro-install-clean-up b/bin/distro-install-clean-up
index c18a2c4..98fb546 100755
--- a/bin/distro-install-clean-up
+++ b/bin/distro-install-clean-up
@@ -59,7 +59,7 @@ if test -f $DESTDIR$INSTALLDIR/help/en/sbasic.cfg -a \
fi
echo "Fixing permissions..."
-for dir in $DESTDIR$DOCDIR
$DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/examples ; do
+for dir in $DESTDIR$DOCDIR $DESTDIR$INSTALLDIR/sdk/examples ; do
if test -d $dir -a -w $dir ; then
find "$dir" -type f \( -name "*.txt" -o -name "*.java" -o -name "*.xml"
-o \
-name "*.xcu" -o -name "*.xcs" -o -name
"*.html" -o \
diff --git a/bin/distro-install-desktop-integration
b/bin/distro-install-desktop-integration
index 466a9ad..f988e12 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -182,9 +182,9 @@ if test "$WITH_COMPAT_OOWRAPPERS" = "YES" ; then
fi
echo "Install $OOINSTDIR/basis$VERSION/program/java-set-classpath";
-mkdir -p $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/program
-sed -e "s|@INSTALLDIR@|$INSTALLDIR|g" bin/java-set-classpath.in >|
"$DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/program/java-set-classpath" || exit 1;
-chmod 755 "$DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/program/java-set-classpath"
-test -f $DESTDIR/gid_Module_Root_Brand && echo
"$INSTALLDIR/basis$PRODUCTVERSION/program/java-set-classpath"
>>$DESTDIR/gid_Module_Root_Brand
+mkdir -p $DESTDIR$INSTALLDIR/program
+sed -e "s|@INSTALLDIR@|$INSTALLDIR|g" bin/java-set-classpath.in >|
"$DESTDIR$INSTALLDIR/program/java-set-classpath" || exit 1;
+chmod 755 "$DESTDIR$INSTALLDIR/program/java-set-classpath"
+test -f $DESTDIR/gid_Module_Root_Brand && echo
"$INSTALLDIR/program/java-set-classpath" >>$DESTDIR/gid_Module_Root_Brand
exit 0
diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index eaabf9c..d00d9ea 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -186,7 +186,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "Novell,
Inc." -a "$SPLIT_APP_MODULES" = "YES" \) ; then
for lang in `echo $WITH_LANG_LIST | sed -e s/-/_/g`; do
test -f $FILELISTSDIR/help_${lang}_list.txt || continue;
-mv_file_between_flists $FILELISTSDIR/help_${lang}_list.txt
$FILELISTSDIR/lang_${lang}_list.txt $INSTALLDIR/basis$PRODUCTVERSION/help/.*
+mv_file_between_flists $FILELISTSDIR/help_${lang}_list.txt
$FILELISTSDIR/lang_${lang}_list.txt $INSTALLDIR/help/.*
add_used_directories $FILELISTSDIR/help_${lang}_list.txt
$FILELISTSDIR/lang_${lang}_list.txt
done
fi
@@ -206,28 +206,28 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
# kde subpackage
test -f $DESTDIR/gid_Module_Optional_Kde && cp
$DESTDIR/gid_Module_Optional_Kde kde_list.txt || :
mv_file_between_flists kde_list.txt common_list.txt
$INSTALLDIR/program/kdefilepicker
-mv_file_between_flists kde_list.txt common_list.txt
$INSTALLDIR/basis$PRODUCTVERSION/program/fps_kde.uno.so
-mv_file_between_flists kde_list.txt common_list.txt
$INSTALLDIR/basis$PRODUCTVERSION/program/libvclplug_kdel..so
-mv_file_between_flists kde_list.txt common_list.txt
$INSTALLDIR/basis$PRODUCTVERSION/program/libkabdrv1.so
+mv_file_between_flists kde_list.txt common_list.txt
$INSTALLDIR/program/fps_kde.uno.so
+mv_file_between_flists kde_list.txt common_list.txt
$INSTALLDIR/program/libvclplug_kdel..so
+mv_file_between_flists kde_list.txt common_list.txt
$INSTALLDIR/program/libkabdrv1.so
add_used_directories kde_list.txt common_list.txt
# create kde4 subpackage
-mv_file_between_flists kde4_list.txt kde_list.txt
$INSTALLDIR/basis$PRODUCTVERSION/program/kde4be1.uno.so
-mv_file_between_flists kde4_list.txt common_list.txt
$INSTALLDIR/basis$PRODUCTVERSION/program/libvclplug_kde4l..so
-mv_file_between_flists kde4_list.txt common_list.txt
$INSTALLDIR/basis$PRODUCTVERSION/program/fps_kde4.uno.so
+mv_file_between_flists kde4_list.txt kde_list.txt
$INSTALLDIR/program/kde4be1.uno.so
+mv_file_between_flists kde4_list.txt common_list.txt
$INSTALLDIR/program/libvclplug_kde4l..so
+mv_file_between_flists kde4_list.txt common_list.txt
$INSTALLDIR/program/fps_kde4.uno.so
add_used_directories kde4_list.txt common_list.txt
# gnome subpackage
test -f $DESTDIR/gid_Module_Optional_Gn
[Libreoffice-commits] .: bin/distro-install-clean-up bin/distro-install-desktop-integration bin/distro-install-file-lists bin/distro-install-sdk
bin/distro-install-clean-up|2 +- bin/distro-install-desktop-integration |2 +- bin/distro-install-file-lists |2 +- bin/distro-install-sdk |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 1dfe0e7c8d1a8c4d67a14c2c79362af09c0a56cf Author: Tomas Chvatal Date: Sat Sep 17 18:57:43 2011 +0200 Env.Set.sh -> Env.Host.sh diff --git a/bin/distro-install-clean-up b/bin/distro-install-clean-up index 229b7e8..c18a2c4 100755 --- a/bin/distro-install-clean-up +++ b/bin/distro-install-clean-up @@ -1,6 +1,6 @@ #!/bin/sh -. ./*[Ee]nv.[Ss]et.sh +. ./*[Ee]nv.[Hh]ost.sh echo "Cleaning up ..."; diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration index 1cb2c42..80e5c4a 100755 --- a/bin/distro-install-desktop-integration +++ b/bin/distro-install-desktop-integration @@ -1,6 +1,6 @@ #!/bin/sh -. ./*[Ee]nv.[Ss]et.sh +. ./*[Ee]nv.[Hh]ost.sh PRODUCTVERSION_NODOT=`echo $PRODUCTVERSION | sed -e "s/\.//"` diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists index f3a8bbf..b233030 100755 --- a/bin/distro-install-file-lists +++ b/bin/distro-install-file-lists @@ -1,6 +1,6 @@ #!/bin/sh -. ./*[Ee]nv.[Ss]et.sh +. ./*[Ee]nv.[Hh]ost.sh BUILDDIR=`pwd` FILELISTSDIR="$BUILDDIR/file-lists" diff --git a/bin/distro-install-sdk b/bin/distro-install-sdk index 3dca2af..05175f6 100755 --- a/bin/distro-install-sdk +++ b/bin/distro-install-sdk @@ -1,6 +1,6 @@ #!/bin/sh -. ./*[Ee]nv.[Ss]et.sh +. ./*[Ee]nv.[Hh]ost.sh if test -d $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk ; then ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
