[ooo-build-commit] .: 2 commits - bin/amt-license-patch bin/applyflags bin/build-galleries bin/build-ooo bin/build-tools bin/create-gitignores.sh bin/create-ids bin/create-rpms bin/create-tags bin/create-tests-lst.sh bin/cws-extract-svn bin/defuzzpatch bin/deps.sh bin/extract-gsi bin/extract-new-strings bin/fix-trailing-space.sh bin/g bin/gen-xlsx-copy-of-xls.sh bin/gob-bump bin/install-artwork bin/install-dictionaries bin/install-mono bin/install-sdk bin/localize-ooo bin/make-win32-iso bin/mkcppcheck.sh bin/mkdocs.sh bin/ooconvwatch bin/oodocdiff.sh bin/package-ooo bin/pyunorc-update64.in bin/rcspack bin/split-to-projects bin/test-ooo bin/tinbuild bin/unpack patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Thu Oct 7 06:46:48 PDT 2010
bin/amt-license-patch | 2
bin/applyflags | 2
bin/build-galleries | 2
bin/build-ooo | 2
bin/build-tools | 2
bin/create-gitignores.sh | 2
bin/create-ids | 2
bin/create-rpms | 2
bin/create-tags | 2
bin/create-tests-lst.sh | 2
bin/cws-extract-svn | 2
bin/defuzzpatch | 2
bin/deps.sh | 2
bin/extract-gsi | 2
bin/extract-new-strings | 2
bin/fix-trailing-space.sh | 2
bin/g | 2
bin/gen-xlsx-copy-of-xls.sh | 2
bin/gob-bump | 2
bin/install-artwork | 2
bin/install-dictionaries | 2
bin/install-mono | 2
bin/install-sdk | 2
bin/localize-ooo | 2
bin/make-win32-iso | 2
bin/mkcppcheck.sh | 2
bin/mkdocs.sh | 2
bin/ooconvwatch | 2
bin/oodocdiff.sh | 2
bin/package-ooo | 2
bin/pyunorc-update64.in | 2
bin/rcspack | 2
bin/split-to-projects | 2
bin/test-ooo | 2
bin/tinbuild | 2
bin/unpack | 2
patches/dev300/apply | 6
patches/dev300/win32-activex-disable.diff | 342 ----------
patches/dev300/win32-multi-lang-installer-update-xml-filename.diff | 20
39 files changed, 36 insertions(+), 404 deletions(-)
New commits:
commit 86e72e07f466cf19e2a7b4bd68e9f1e913a07af0
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Oct 7 15:46:23 2010 +0200
Remove some patches that are in git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 586c2a3..485e60d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -972,12 +972,6 @@ warning-return-values-lotuswordpro-2.diff, pmladek
win32-gw-send-mail.diff, i#34264, n#418407, tml
[ Win32Only ]
-# This is a pretty nasty IE problem i#19510, i#65209
-# FIXME: 2009-10-26: Let's assume the problem is gone for now.
-# And actually afaics embedding doesn't work anyway, even
-# in upstream!?
-# win32-activex-disable.diff, i#65209, i#19510, n#168534, tml
-
# fixes for visual studio express 2005 ( ooo-build only )
2005-express-stl-remove.diff, noelpwer, i#71404
diff --git a/patches/dev300/win32-activex-disable.diff b/patches/dev300/win32-activex-disable.diff
deleted file mode 100644
index f78304e..0000000
--- a/patches/dev300/win32-activex-disable.diff
+++ /dev/null
@@ -1,342 +0,0 @@
---- configure.in Wed May 3 15:15:00 2006
-+++ configure.in Wed May 3 14:38:03 2006
-@@ -74,6 +74,9 @@
- epm, however epm is useless for large scale
- package building.
- ],,enable_epm="yes")
-+AC_ARG_ENABLE(activex_component,
-+[ --disable-activex-component Remove support for ActiveX embedding of OOo
-+],,enable_activex_component=yes)
- AC_ARG_WITH(epm,
- [ --with-epm Decides which epm to use. Default is to use
- the one from the system if one is built. When
-@@ -4268,6 +4272,20 @@
- AC_SUBST(WITH_WRITER2LATEX)
-
- AC_SUBST(SCPDEFS)
-+
-+if test "$_os" = "WINNT"; then
-+ AC_MSG_CHECKING([whether to enable ActiveX embedding of OOo components])
-+ if test "$enable_activex_component" = "yes" -o "$enable_activex_component" = "TRUE" -o "$enable_activex_component" = ""; then
-+ ENABLE_ACTIVEX_COMPONENT="TRUE"
-+ AC_MSG_RESULT([yes])
-+ SCPDEFS="$SCPDEFS -DWITH_ACTIVEX_COMPONENT"
-+ else
-+ ENABLE_ACTIVEX_COMPONENT=""
-+ AC_MSG_RESULT([no])
-+ fi
-+ AC_SUBST(ENABLE_ACTIVEX_COMPONENT)
-+ AC_SUBST(SCPDEFS)
-+fi
-
- AC_MSG_CHECKING([whether and how to use Xinerama])
- if test "$_os" = "Darwin"; then
---- scp2/source/activex/file_activex.scp Thu Oct 27 17:08:13 2005
-+++ scp2/source/activex/file_activex.scp Wed May 3 14:24:12 2006
-@@ -36,4 +36,6 @@
- #include "macros.inc"
-
-+#ifdef WITH_ACTIVEX_COMPONENT
-+
- File gid_File_Lib_Soactivex
- TXT_FILE_BODY;
-@@ -57,2 +59,3 @@
- End
-
-+#endif // WITH_ACTIVEX_COMPONENT
---- scp2/source/activex/module_activex.scp Fri Sep 9 04:17:32 2005
-+++ scp2/source/activex/module_activex.scp Wed May 3 14:24:29 2006
-@@ -36,6 +36,8 @@
-
- #include "macros.inc"
-
-+#ifdef WITH_ACTIVEX_COMPONENT
-+
- Module gid_Module_Optional_Activexcontrol
- PackageInfo = "packinfo_office.txt";
- MOD_NAME_DESC ( MODULE_OPTIONAL_ACTIVEXCONTROL );
-@@ -43,3 +45,5 @@
- ParentID = gid_Module_Optional;
- Files = (gid_File_Lib_Soactivex, gid_File_Lib_Regactivex_Msi, gid_File_Lib_Regpatchactivex_Msi);
- End
-+
-+#endif // WITH_ACTIVEX_COMPONENT
---- scp2/source/calc/registryitem_calc.scp Thu Nov 10 18:18:08 2005
-+++ scp2/source/calc/registryitem_calc.scp Wed May 3 14:25:20 2006
-@@ -36,6 +36,8 @@
-
- #include "macros.inc"
-
-+#ifdef WITH_ACTIVEX_COMPONENT
-+
- // MSOLE embedded object in SO7 file format
- RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c_
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -272,6 +274,8 @@
- Value = "opendocument.CalcDocument.1";
- End
-
-+#endif // WITH_ACTIVEX_COMPONENT
-+
- RegistryItem gid_Regitem_Soffice_Starcalcdocument_6
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Prg_Calc_Bin;
-@@ -359,6 +363,8 @@
- REG_VALUE_LNG(SO60_SPREADSHEET)
- End
-
-+#ifdef WITH_ACTIVEX_COMPONENT
-+
- RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Clsid
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Prg_Calc_Bin;
-@@ -366,6 +372,8 @@
- Value = "{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}";
- End
-
-+#endif // WITH_ACTIVEX_COMPONENT
-+
- RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Defaulticon
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Prg_Calc_Bin;
-@@ -688,6 +696,8 @@
- REG_VALUE_LNG(OO_CALC)
- End
-
-+#ifdef WITH_ACTIVEX_COMPONENT
-+
- RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Clsid
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Prg_Calc_Bin;
-@@ -694,6 +704,8 @@
- Subkey = "opendocument.CalcDocument.1\CLSID";
- Value = "{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}";
- End
-+
-+#endif // WITH_ACTIVEX_COMPONENT
-
- RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Defaulticon
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
---- scp2/source/draw/registryitem_draw.scp Thu Nov 10 18:18:21 2005
-+++ scp2/source/draw/registryitem_draw.scp Wed May 3 14:25:46 2006
-@@ -36,6 +36,8 @@
-
- #include "macros.inc"
-
-+#ifdef WITH_ACTIVEX_COMPONENT
-+
- // MSOLE embedded object in SO7 file format
- RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273_
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -272,7 +274,7 @@
- Value = "opendocument.DrawDocument.1";
- End
-
--
-+#endif // WITH_ACTIVEX_COMPONENT
-
- RegistryItem gid_Regitem_Soffice_Stardrawdocument_6
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -361,6 +363,8 @@
- REG_VALUE_LNG(SO60_DRAWING)
- End
-
-+#ifdef WITH_ACTIVEX_COMPONENT
-+
- RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Clsid
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Prg_Draw_Bin;
-@@ -368,6 +372,8 @@
- Value = "{41662FC2-0D57-4aff-AB27-AD2E12E7C273}";
- End
-
-+#endif // WITH_ACTIVEX_COMPONENT
-+
- RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Defaulticon
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Prg_Draw_Bin;
-@@ -690,6 +696,8 @@
- REG_VALUE_LNG(OO_DRAW)
- End
-
-+#ifdef WITH_ACTIVEX_COMPONENT
-+
- RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Clsid
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Prg_Draw_Bin;
-@@ -696,6 +704,8 @@
- Subkey = "opendocument.DrawDocument.1\CLSID";
- Value = "{448BB771-CFE2-47C4-BCDF-1FBF378E202C}";
- End
-+
-+#endif // WITH_ACTIVEX_COMPONENT
-
- RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Defaulticon
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
---- scp2/source/impress/registryitem_impress.scp Thu Nov 10 18:18:33 2005
-+++ scp2/source/impress/registryitem_impress.scp Wed May 3 14:26:13 2006
-@@ -36,6 +36,8 @@
-
- #include "macros.inc"
-
-+#ifdef WITH_ACTIVEX_COMPONENT
-+
- // MSOLE embedded object in SO7 file format
- RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8_
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -272,7 +274,7 @@
- Value = "opendocument.ImpressDocument.1";
- End
-
--
-+#endif // WITH_ACTIVEX_COMPONENT
-
- RegistryItem gid_Regitem_Soffice_Starimpressdocument_6
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -377,6 +379,8 @@
- REG_VALUE_LNG(SO60_PRESENT)
- End
-
-+#ifdef WITH_ACTIVEX_COMPONENT
-+
- RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Clsid
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Prg_Impress_Bin;
-@@ -384,6 +388,8 @@
- Value = "{E5A0B632-DFBA-4549-9346-E414DA06E6F8}";
- End
-
-+#endif // WITH_ACTIVEX_COMPONENT
-+
- RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Defaulticon
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Prg_Impress_Bin;
-@@ -727,6 +733,8 @@
- REG_VALUE_LNG(OO_PRESENT)
- End
-
-+#ifdef WITH_ACTIVEX_COMPONENT
-+
- RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Clsid
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Prg_Impress_Bin;
-@@ -733,6 +741,8 @@
- Subkey = "opendocument.ImpressDocument.1\CLSID";
- Value = "{EE5D1EA4-D445-4289-B2FC-55FC93693917}";
- End
-+
-+#endif // WITH_ACTIVEX_COMPONENT
-
- RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Defaulticon
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
---- scp2/source/math/registryitem_math.scp Thu Nov 10 18:18:46 2005
-+++ scp2/source/math/registryitem_math.scp Wed May 3 14:26:36 2006
-@@ -35,6 +35,8 @@
- ************************************************************************/
- #include "macros.inc"
-
-+#ifdef WITH_ACTIVEX_COMPONENT
-+
- // MSOLE embedded object in SO7 file format
- RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a_
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -271,7 +273,7 @@
- Value = "opendocument.MathDocument.1";
- End
-
--
-+#endif // WITH_ACTIVEX_COMPONENT
-
- RegistryItem gid_Regitem_Soffice_Starmathdocument_6
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -360,6 +362,8 @@
- REG_VALUE_LNG(SO60_FORMULA)
- End
-
-+#ifdef WITH_ACTIVEX_COMPONENT
-+
- RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Clsid
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Prg_Math_Bin;
-@@ -367,6 +371,8 @@
- Value = "{D0484DE6-AAEE-468a-991F-8D4B0737B57A}";
- End
-
-+#endif // WITH_ACTIVEX_COMPONENT
-+
- RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Defaulticon
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Prg_Math_Bin;
-@@ -582,6 +588,8 @@
- REG_VALUE_LNG(OO_FORMULA)
- End
-
-+#ifdef WITH_ACTIVEX_COMPONENT
-+
- RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Clsid
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Prg_Math_Bin;
-@@ -588,6 +596,8 @@
- Subkey = "opendocument.MathDocument.1\CLSID";
- Value = "{D2D59CD1-0A6A-4D36-AE20-47817077D57C}";
- End
-+
-+#endif // WITH_ACTIVEX_COMPONENT
-
- RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Defaulticon
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
---- scp2/source/writer/registryitem_writer.scp Thu Nov 10 18:19:00 2005
-+++ scp2/source/writer/registryitem_writer.scp Wed May 3 14:27:50 2006
-@@ -36,6 +36,8 @@
-
- #include "macros.inc"
-
-+#ifdef WITH_ACTIVEX_COMPONENT
-+
- // MSOLE embedded object in SO7 file format
- RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e_
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -272,6 +274,7 @@
- Value = "opendocument.WriterDocument.1";
- End
-
-+#endif // WITH_ACTIVEX_COMPONENT
-
- RegistryItem gid_Regitem_Soffice_Starwriterdocument_6
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -376,6 +379,8 @@
- REG_VALUE_LNG(SO60_TEXT)
- End
-
-+#ifdef WITH_ACTIVEX_COMPONENT
-+
- RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Clsid
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Prg_Wrt_Bin;
-@@ -383,6 +388,8 @@
- Value = "{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}";
- End
-
-+#endif // WITH_ACTIVEX_COMPONENT
-+
- RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Defaulticon
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Prg_Wrt_Bin;
-@@ -882,6 +889,8 @@
- REG_VALUE_LNG(OO_WRITER)
- End
-
-+#ifdef WITH_ACTIVEX_COMPONENT
-+
- RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Clsid
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Prg_Wrt_Bin;
-@@ -888,6 +897,8 @@
- Subkey = "opendocument.WriterDocument.1\CLSID";
- Value = "{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}";
- End
-+
-+#endif // WITH_ACTIVEX_COMPONENT
-
- RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Defaulticon
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
diff --git a/patches/dev300/win32-multi-lang-installer-update-xml-filename.diff b/patches/dev300/win32-multi-lang-installer-update-xml-filename.diff
deleted file mode 100644
index 505d190..0000000
--- a/patches/dev300/win32-multi-lang-installer-update-xml-filename.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- instsetoo_native/util/makefile.mk
-+++ instsetoo_native/util/makefile.mk
-@@ -234,7 +234,7 @@
- .ENDIF # "$(MAKETARGETS)"!=""
- openoffice_%{$(PKGFORMAT:^".") .archive} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-+ $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-
- $(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
- openofficewithjre_%{$(PKGFORMAT:^".")} :
-@@ -251,7 +251,7 @@
- $(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
- openofficedev_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-+ $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-
- $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
- ooolanguagepack_%{$(PKGFORMAT:^".")} :
commit 0e7c4fb5dd914390b72c9e9d34e06fac4c8a5321
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Oct 7 15:11:19 2010 +0200
generalize the \!/bin/sh shebang
Fix the bashisms as they appear
diff --git a/bin/amt-license-patch b/bin/amt-license-patch
index 1358e91..f6604f2 100755
--- a/bin/amt-license-patch
+++ b/bin/amt-license-patch
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
indexentry=`mktemp`
body=`mktemp`
diff --git a/bin/applyflags b/bin/applyflags
index 42826ad..531c89a 100755
--- a/bin/applyflags
+++ b/bin/applyflags
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# generate flags for apply.pl - from various pieces ...
# highly dependent on a custom environment ...
diff --git a/bin/build-galleries b/bin/build-galleries
index ebebb65..731b75d 100755
--- a/bin/build-galleries
+++ b/bin/build-galleries
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# this script is useful to generate galleries for OOo from Open Clip Art
# Library source tarball that it available at
diff --git a/bin/build-ooo b/bin/build-ooo
index d437e8e..056941b 100755
--- a/bin/build-ooo
+++ b/bin/build-ooo
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# See setup for user tweakables.
diff --git a/bin/build-tools b/bin/build-tools
index acbf182..525cde5 100755
--- a/bin/build-tools
+++ b/bin/build-tools
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# See setup for user tweakables.
diff --git a/bin/create-gitignores.sh b/bin/create-gitignores.sh
index 6013de4..0d14dc6 100755
--- a/bin/create-gitignores.sh
+++ b/bin/create-gitignores.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# create .gitignores for the the OOo tree
# run in build/xyz680-mABC
diff --git a/bin/create-ids b/bin/create-ids
index f88e385..6a93116 100755
--- a/bin/create-ids
+++ b/bin/create-ids
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# create ID file for the whole OOo tree. run it in build/xyz680-mABC
diff --git a/bin/create-rpms b/bin/create-rpms
index a08e57d..6b8dd5f 100755
--- a/bin/create-rpms
+++ b/bin/create-rpms
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/sh
# build rpms ; passing -l option will build language packs too
diff --git a/bin/create-tags b/bin/create-tags
index 85d53bd..61dfe0e 100755
--- a/bin/create-tags
+++ b/bin/create-tags
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# create tags file for the whole OOo tree. run it in build/xyz680-mABC
. ./*.Set.sh
diff --git a/bin/create-tests-lst.sh b/bin/create-tests-lst.sh
index fea0c5a..c136994 100755
--- a/bin/create-tests-lst.sh
+++ b/bin/create-tests-lst.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
[ -f prj/build.lst ] || { echo -e "create-tests-lst.sh: Creates prj/tests.lst\nError: Must be in project subdir" ; exit 1 ; }
diff --git a/bin/cws-extract-svn b/bin/cws-extract-svn
index 0db45cd..b5934d4 100755
--- a/bin/cws-extract-svn
+++ b/bin/cws-extract-svn
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
usage() {
echo 1>&2 << EOF
diff --git a/bin/defuzzpatch b/bin/defuzzpatch
index 6972c1e..cd60f73 100755
--- a/bin/defuzzpatch
+++ b/bin/defuzzpatch
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
usage()
{
diff --git a/bin/deps.sh b/bin/deps.sh
index 4bf3916..f640a3e 100755
--- a/bin/deps.sh
+++ b/bin/deps.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Find all dependencies based on prj/build.lst (transitive closure)
# [not the ideal implementation, but it was fast to write ;-)]
diff --git a/bin/extract-gsi b/bin/extract-gsi
index 8d28566..01961b0 100755
--- a/bin/extract-gsi
+++ b/bin/extract-gsi
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/sh
#
# See setup for user tweakables.
diff --git a/bin/extract-new-strings b/bin/extract-new-strings
index ac1a0c2..1d82f3b 100755
--- a/bin/extract-new-strings
+++ b/bin/extract-new-strings
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/sh
#
# See setup for user tweakables.
diff --git a/bin/fix-trailing-space.sh b/bin/fix-trailing-space.sh
index 2ae222b..ac070bf 100755
--- a/bin/fix-trailing-space.sh
+++ b/bin/fix-trailing-space.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/sh
# when git commit gives the following, feed this error output as input to this script
# l10ntools/java/jpropex/java/JPropEx.java:28: trailing whitespace.
diff --git a/bin/g b/bin/g
index 48b979e..41946f4 100755
--- a/bin/g
+++ b/bin/g
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# Wrapper for git to handle more subdirs at the same time
#
diff --git a/bin/gen-xlsx-copy-of-xls.sh b/bin/gen-xlsx-copy-of-xls.sh
index fe50aab..33d00d1 100755
--- a/bin/gen-xlsx-copy-of-xls.sh
+++ b/bin/gen-xlsx-copy-of-xls.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
TREE="$1"
diff --git a/bin/gob-bump b/bin/gob-bump
index 5af5ad7..23a3476 100755
--- a/bin/gob-bump
+++ b/bin/gob-bump
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -e
diff --git a/bin/install-artwork b/bin/install-artwork
index 25a72f2..6a3828f 100755
--- a/bin/install-artwork
+++ b/bin/install-artwork
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# installs artwork, opportunistically from src to dest
diff --git a/bin/install-dictionaries b/bin/install-dictionaries
index 3ead159..1e7ff4d 100755
--- a/bin/install-dictionaries
+++ b/bin/install-dictionaries
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# See setup for user tweakables.
diff --git a/bin/install-mono b/bin/install-mono
index d37d7a5..49bfa67 100755
--- a/bin/install-mono
+++ b/bin/install-mono
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# this script finishes the mono installation
diff --git a/bin/install-sdk b/bin/install-sdk
index b632bbb..b49e7b8 100755
--- a/bin/install-sdk
+++ b/bin/install-sdk
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# this script finishes the mono installation
diff --git a/bin/localize-ooo b/bin/localize-ooo
index f0b6937..d253d6d 100755
--- a/bin/localize-ooo
+++ b/bin/localize-ooo
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# See setup for user tweakables.
diff --git a/bin/make-win32-iso b/bin/make-win32-iso
index 211e8fe..38f193c 100755
--- a/bin/make-win32-iso
+++ b/bin/make-win32-iso
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Create two ISOs for Win32:
# -multilingual installer and additional language pack installers
diff --git a/bin/mkcppcheck.sh b/bin/mkcppcheck.sh
index 9102933..0d88371 100755
--- a/bin/mkcppcheck.sh
+++ b/bin/mkcppcheck.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# run cppcheck
#
diff --git a/bin/mkdocs.sh b/bin/mkdocs.sh
index 80523d9..fe76300 100755
--- a/bin/mkdocs.sh
+++ b/bin/mkdocs.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# Doxygen Doc generation
#
diff --git a/bin/ooconvwatch b/bin/ooconvwatch
index a101f64..2a89b6d 100755
--- a/bin/ooconvwatch
+++ b/bin/ooconvwatch
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# run convwatch for all files given in ooo-build/test (or below -d <dir>)
diff --git a/bin/oodocdiff.sh b/bin/oodocdiff.sh
index 99d2b62..cb04a06 100755
--- a/bin/oodocdiff.sh
+++ b/bin/oodocdiff.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
########################################################################
#
# Copyright (c) 2010 Thorsten Behrens, Miklos Vajna
diff --git a/bin/package-ooo b/bin/package-ooo
index 2f8f4c2..fbb3c6a 100755
--- a/bin/package-ooo
+++ b/bin/package-ooo
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Based on docs/setup.txt
diff --git a/bin/pyunorc-update64.in b/bin/pyunorc-update64.in
index f3baae2..d39a3f9 100755
--- a/bin/pyunorc-update64.in
+++ b/bin/pyunorc-update64.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#*****************************************************************************
#
diff --git a/bin/rcspack b/bin/rcspack
index f1df1c3..73e4f8e 100755
--- a/bin/rcspack
+++ b/bin/rcspack
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
EXCL=/tmp/rcspack-exclude
diff --git a/bin/split-to-projects b/bin/split-to-projects
index 640d1ce..ef052a8 100755
--- a/bin/split-to-projects
+++ b/bin/split-to-projects
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/sh
function usage() {
echo "split-to-projects patch.diff basename
diff --git a/bin/test-ooo b/bin/test-ooo
index 5e10452..26baf8d 100755
--- a/bin/test-ooo
+++ b/bin/test-ooo
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# This script helps testig OOo installation using the ooqatesttool,
# http://qa.openoffice.org/qatesttool/index.html
diff --git a/bin/tinbuild b/bin/tinbuild
index c2b736e..9ba7d9a 100755
--- a/bin/tinbuild
+++ b/bin/tinbuild
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
## default config
PAUSE_SECONDS=$((15*60))
diff --git a/bin/unpack b/bin/unpack
index a977e9d..d38e15d 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# See setup for user tweakables.
More information about the ooo-build-commit
mailing list