Repository.mk | 26 ++++++++++++++++++++++++++
desktop/Module_desktop.mk | 6 ++++++
desktop/Package_sbase_sh.mk | 14 ++++++++++++++
desktop/Package_scalc_sh.mk | 14 ++++++++++++++
desktop/Package_scripts.mk | 6 ------
desktop/Package_sdraw_sh.mk | 14 ++++++++++++++
desktop/Package_simpress_sh.mk | 14 ++++++++++++++
desktop/Package_smath_sh.mk | 14 ++++++++++++++
desktop/Package_swriter_sh.mk | 14 ++++++++++++++
scp2/source/base/file_base.scp | 9 ---------
scp2/source/base/module_base.scp | 2 +-
scp2/source/calc/file_calc.scp | 9 ---------
scp2/source/calc/module_calc.scp | 2 +-
scp2/source/draw/file_draw.scp | 8 --------
scp2/source/draw/module_draw.scp | 2 +-
scp2/source/impress/file_impress.scp | 9 ---------
scp2/source/impress/module_impress.scp | 2 +-
scp2/source/math/file_math.scp | 8 --------
scp2/source/math/module_math.scp | 2 +-
scp2/source/writer/file_writer.scp | 9 ---------
scp2/source/writer/module_writer.scp | 2 +-
21 files changed, 122 insertions(+), 64 deletions(-)
New commits:
commit 139a4b6229905e44f22a0b747ea9c44f30e468f4
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Oct 31 23:42:37 2014 +0100
scp2: move unx wrapper scripts to AutoInstall
Change-Id: I661656e486b088c28b78e5c3ed4fbe9945991097
diff --git a/Repository.mk b/Repository.mk
index f879375..da317f1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -804,10 +804,36 @@ $(eval $(call
gb_Helper_register_packages_for_install,ure,\
) \
))
+ifeq ($(GUIBASE),unx)
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
xmlsec \
))
+$(eval $(call gb_Helper_register_packages_for_install,base_brand,\
+ desktop_sbase_sh \
+))
+
+$(eval $(call gb_Helper_register_packages_for_install,calc_brand,\
+ desktop_scalc_sh \
+))
+
+$(eval $(call gb_Helper_register_packages_for_install,draw_brand,\
+ desktop_sdraw_sh \
+))
+
+$(eval $(call gb_Helper_register_packages_for_install,impress_brand,\
+ desktop_simpress_sh \
+))
+
+$(eval $(call gb_Helper_register_packages_for_install,math_brand,\
+ desktop_smath_sh \
+))
+
+$(eval $(call gb_Helper_register_packages_for_install,writer_brand,\
+ desktop_swriter_sh \
+))
+endif # GUIBASE=unx
+
# External executables
$(eval $(call gb_ExternalExecutable_register_executables,\
genbrk \
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index d1af15a..d98fd84 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -18,15 +18,6 @@
#include "macros.inc"
-#if !defined MACOSX && !defined WNT
-File gid_File_Exe_Sbase
- BIN_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = "sbase";
- Styles = (PACKED);
-End
-#endif
-
STD_RES_FILE( gid_File_Res_Abp, abp)
STD_RES_FILE( gid_File_Res_Dbp, dbp)
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index c593e7e..0413bc4 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -51,7 +51,7 @@ Module gid_Module_Brand_Prg_Base
Minimal = YES;
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (auto_base_brand_ALL,gid_File_Exe_Sbase);
+ Files = (auto_base_brand_ALL);
End
Module gid_Module_Langpack_Base_Template
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 390fd0e..eae330c 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -41,15 +41,6 @@ File gid_File_Help_Scalc_Zip
End
#endif
-#if !defined MACOSX && !defined WNT
-File gid_File_Exe_Scalc
- BIN_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = "scalc";
- Styles = (PACKED);
-End
-#endif
-
#if defined(WITH_LPSOLVER)
STD_RES_FILE( gid_File_Res_Solver, solver)
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index 47d6426..a1ca74b 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -60,7 +60,7 @@ Module gid_Module_Brand_Prg_Calc
Minimal = YES;
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (auto_calc_brand_ALL,gid_File_Exe_Scalc);
+ Files = (auto_calc_brand_ALL);
End
Module gid_Module_Langpack_Calc_Template
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
index 4f8d610..49d6d5d 100644
--- a/scp2/source/draw/file_draw.scp
+++ b/scp2/source/draw/file_draw.scp
@@ -33,11 +33,3 @@ File gid_File_Help_Sdraw_Zip
End
#endif
-#if !defined MACOSX && !defined WNT
-File gid_File_Exe_Sdraw
- BIN_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = "sdraw";
- Styles = (PACKED);
-End
-#endif
diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
index a2db15d..36ef3a7 100644
--- a/scp2/source/draw/module_draw.scp
+++ b/scp2/source/draw/module_draw.scp
@@ -50,7 +50,7 @@ Module gid_Module_Brand_Prg_Draw
Minimal = YES;
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (auto_draw_brand_ALL,gid_File_Exe_Sdraw);
+ Files = (auto_draw_brand_ALL);
End
Module gid_Module_Langpack_Draw_Template
diff --git a/scp2/source/impress/file_impress.scp
b/scp2/source/impress/file_impress.scp
index 5cb4126..81ad53c 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -33,15 +33,6 @@ File gid_File_Help_Simpress_Zip
End
#endif
-#if !defined MACOSX && !defined WNT
-File gid_File_Exe_Simpress
- BIN_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = "simpress";
- Styles = (PACKED);
-End
-#endif
-
// configuration files for custom animation effects
File gid_File_sd_xml
diff --git a/scp2/source/impress/module_impress.scp
b/scp2/source/impress/module_impress.scp
index 38e445f..54ee6d7 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -53,7 +53,7 @@ Module gid_Module_Brand_Prg_Impress
Minimal = YES;
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (auto_impress_brand_ALL,gid_File_Exe_Simpress);
+ Files = (auto_impress_brand_ALL);
End
Module gid_Module_Langpack_Impress_Template
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index 6fab35a..a7a75b5 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -35,11 +35,3 @@ File gid_File_Help_Smath_Zip
End
#endif
-#if !defined MACOSX && !defined WNT
-File gid_File_Exe_Smath
- BIN_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = "smath";
- Styles = (PACKED);
-End
-#endif
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
index c281437..a683e47 100644
--- a/scp2/source/math/module_math.scp
+++ b/scp2/source/math/module_math.scp
@@ -52,7 +52,7 @@ Module gid_Module_Brand_Prg_Math
Minimal = YES;
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (auto_math_brand_ALL,gid_File_Exe_Smath);
+ Files = (auto_math_brand_ALL);
End
Module gid_Module_Langpack_Math_Template
diff --git a/scp2/source/writer/file_writer.scp
b/scp2/source/writer/file_writer.scp
index 280e40a..28966fc 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -18,15 +18,6 @@
#include "macros.inc"
-#if !defined MACOSX && !defined WNT
-File gid_File_Exe_Swriter
- BIN_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = "swriter";
- Styles = (PACKED);
-End
-#endif
-
#if defined WITH_HELP
File gid_File_Help_Swriter_Zip
Dir = FILELIST_DIR;
diff --git a/scp2/source/writer/module_writer.scp
b/scp2/source/writer/module_writer.scp
index 987a7c7..b0a0d3a 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -56,7 +56,7 @@ Module gid_Module_Brand_Prg_Wrt
Minimal = YES;
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (auto_writer_brand_ALL,gid_File_Exe_Swriter);
+ Files = (auto_writer_brand_ALL);
End
Module gid_Module_Langpack_Writer_Template
commit 2f6005ddb25cd9b7d5372f2abfd9908a21a44b3c
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Oct 31 23:24:54 2014 +0100
desktop: split up Package_script corresponding to scp2 modules
Change-Id: Ibe374db0c9d2f7bcbae536102a0305a8b94667d7
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index a10f57e..76c55b3 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -48,6 +48,12 @@ $(eval $(call gb_Module_add_targets,desktop,\
Pagein_impress \
Pagein_writer \
CustomTarget_soffice \
+ Package_sbase_sh \
+ Package_scalc_sh \
+ Package_sdraw_sh \
+ Package_simpress_sh \
+ Package_smath_sh \
+ Package_swriter_sh \
Package_soffice_sh \
))
endif
diff --git a/desktop/Package_sbase_sh.mk b/desktop/Package_sbase_sh.mk
new file mode 100644
index 0000000..ada63e2
--- /dev/null
+++ b/desktop/Package_sbase_sh.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,desktop_sbase_sh,$(SRCDIR)/desktop/scripts))
+
+$(eval $(call
gb_Package_add_file,desktop_sbase_sh,$(LIBO_BIN_FOLDER)/sbase,sbase.sh))
+
+# vim: set ts=4 sw=4 noet:
diff --git a/desktop/Package_scalc_sh.mk b/desktop/Package_scalc_sh.mk
new file mode 100644
index 0000000..5d29e16
--- /dev/null
+++ b/desktop/Package_scalc_sh.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,desktop_scalc_sh,$(SRCDIR)/desktop/scripts))
+
+$(eval $(call
gb_Package_add_file,desktop_scalc_sh,$(LIBO_BIN_FOLDER)/scalc,scalc.sh))
+
+# vim: set ts=4 sw=4 noet:
diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index ed2ae3e..3c86abe 100644
--- a/desktop/Package_scripts.mk
+++ b/desktop/Package_scripts.mk
@@ -12,12 +12,6 @@ $(eval $(call
gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scrip
ifeq (,$(filter MACOSX WNT,$(OS)))
$(eval $(call
gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/gdbtrace,gdbtrace))
-$(eval $(call
gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/sbase,sbase.sh))
-$(eval $(call
gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/scalc,scalc.sh))
-$(eval $(call
gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/sdraw,sdraw.sh))
-$(eval $(call
gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/simpress,simpress.sh))
-$(eval $(call
gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/smath,smath.sh))
-$(eval $(call
gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/swriter,swriter.sh))
endif
diff --git a/desktop/Package_sdraw_sh.mk b/desktop/Package_sdraw_sh.mk
new file mode 100644
index 0000000..58ae0f5
--- /dev/null
+++ b/desktop/Package_sdraw_sh.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,desktop_sdraw_sh,$(SRCDIR)/desktop/scripts))
+
+$(eval $(call
gb_Package_add_file,desktop_sdraw_sh,$(LIBO_BIN_FOLDER)/sdraw,sdraw.sh))
+
+# vim: set ts=4 sw=4 noet:
diff --git a/desktop/Package_simpress_sh.mk b/desktop/Package_simpress_sh.mk
new file mode 100644
index 0000000..bb315aa
--- /dev/null
+++ b/desktop/Package_simpress_sh.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call
gb_Package_Package,desktop_simpress_sh,$(SRCDIR)/desktop/scripts))
+
+$(eval $(call
gb_Package_add_file,desktop_simpress_sh,$(LIBO_BIN_FOLDER)/simpress,simpress.sh))
+
+# vim: set ts=4 sw=4 noet:
diff --git a/desktop/Package_smath_sh.mk b/desktop/Package_smath_sh.mk
new file mode 100644
index 0000000..67c113a
--- /dev/null
+++ b/desktop/Package_smath_sh.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,desktop_smath_sh,$(SRCDIR)/desktop/scripts))
+
+$(eval $(call
gb_Package_add_file,desktop_smath_sh,$(LIBO_BIN_FOLDER)/smath,smath.sh))
+
+# vim: set ts=4 sw=4 noet:
diff --git a/desktop/Package_swriter_sh.mk b/desktop/Package_swriter_sh.mk
new file mode 100644
index 0000000..88720a9
--- /dev/null
+++ b/desktop/Package_swriter_sh.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,desktop_swriter_sh,$(SRCDIR)/desktop/scripts))
+
+$(eval $(call
gb_Package_add_file,desktop_swriter_sh,$(LIBO_BIN_FOLDER)/swriter,swriter.sh))
+
+# vim: set ts=4 sw=4 noet:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
