[Libreoffice-commits] core.git: 8 commits - Repository.mk scp2/source
Michael Stahl
mstahl at redhat.com
Thu Apr 17 15:03:14 PDT 2014
Repository.mk | 37 +++++++++---------
scp2/source/extensions/file_extensions.scp | 4 -
scp2/source/extensions/module_extensions.scp | 2
scp2/source/ooo/file_ooo.scp | 55 ---------------------------
scp2/source/ooo/module_hidden_ooo.scp | 14 ------
scp2/source/ooo/module_reportbuilder.scp | 5 --
6 files changed, 21 insertions(+), 96 deletions(-)
New commits:
commit 2580b5dd875f7a8d12b652128e27aaea7d9b6403
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Apr 17 23:44:54 2014 +0200
these wizards Jars are gone as well
Change-Id: Ie3010431f69169d022d19c5ba6ff234adf191750
diff --git a/Repository.mk b/Repository.mk
index fc83489..e255636 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -677,13 +677,6 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_rhino, \
))
endif
-$(eval $(call gb_Helper_register_jars,OOO, \
- agenda \
- fax \
- letter \
- web \
-))
-
$(eval $(call gb_Helper_register_jars,OXT, \
EvolutionarySolver \
active_java \
commit 23c6fa8cece31cf4fd1ebd01253910beb07bef73
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Apr 17 23:41:54 2014 +0200
XMerge based filters removed in a5783fe922b2419b5b662eb5f544a1f401341dbf
Change-Id: Idd5dae2843f774fdee49a5f2d5eb26022746c5c1
diff --git a/Repository.mk b/Repository.mk
index cee72b8..fc83489 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -679,12 +679,8 @@ endif
$(eval $(call gb_Helper_register_jars,OOO, \
agenda \
- aportisdoc \
fax \
- htmlsoff \
letter \
- pexcel \
- pocketword \
web \
))
commit 96d36e876441f8ec9b2f1a05ab0a5f82f271e6cc
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Apr 17 23:39:38 2014 +0200
XSLTFilter/XSLTValidate jars are gone
removed by bfc71eb03e2bc6f26d53f70b32f9a8937086808b and
143f0b895fb2c0a1449af4f6f307487900921cbe
Change-Id: Iaf6e99c15356ebe08cfb1d386a6dab97f47a730a
diff --git a/Repository.mk b/Repository.mk
index a57ab08..cee72b8 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -678,8 +678,6 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_rhino, \
endif
$(eval $(call gb_Helper_register_jars,OOO, \
- XSLTFilter \
- XSLTValidate \
agenda \
aportisdoc \
fax \
commit 31c32c14259e8479e61456230804e3e3b0f42067
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Apr 17 23:37:30 2014 +0200
ConnectivityTools is not installed, used by JunitTests
Change-Id: Id095087d05b64119f80e2c1d476091765f017afa
diff --git a/Repository.mk b/Repository.mk
index b669b8a..a57ab08 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -678,7 +678,6 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_rhino, \
endif
$(eval $(call gb_Helper_register_jars,OOO, \
- ConnectivityTools \
XSLTFilter \
XSLTValidate \
agenda \
@@ -700,6 +699,7 @@ $(eval $(call gb_Helper_register_jars,OXT, \
))
$(eval $(call gb_Helper_register_jars,NONE,\
+ ConnectivityTools \
HelloWorld \
Highlight \
MemoryUsage \
commit e9ae308a1675debfccda866264dc6c85f19cf8cb
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Apr 17 23:33:05 2014 +0200
scp2: move reportbuilder Jars to AutoInstall
Change-Id: Ie8e8e4e5278278eecc1a6e54dbb70389df3e7155
diff --git a/Repository.mk b/Repository.mk
index adce4a2..b669b8a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -660,6 +660,11 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,ooo, \
xmerge \
))
+$(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_rhino, \
+ reportbuilder \
+ reportbuilderwizard \
+))
+
ifneq ($(ENABLE_SCRIPTING_BEANSHELL),)
$(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_bsh, \
ScriptProviderForBeanShell \
@@ -683,8 +688,6 @@ $(eval $(call gb_Helper_register_jars,OOO, \
letter \
pexcel \
pocketword \
- reportbuilder \
- reportbuilderwizard \
web \
))
diff --git a/scp2/source/ooo/module_reportbuilder.scp b/scp2/source/ooo/module_reportbuilder.scp
index 1245e7f..ff2502b 100644
--- a/scp2/source/ooo/module_reportbuilder.scp
+++ b/scp2/source/ooo/module_reportbuilder.scp
@@ -23,8 +23,6 @@ Module gid_Module_Reportbuilder
gid_File_Lib_Rpt,
gid_File_Lib_Rptui,
gid_File_Lib_Rptxml,
- gid_File_Jar_Reportbuilder,
- gid_File_Jar_Reportbuilderwizard,
gid_File_Xcd_Reportbuilder,
gid_Filelist_ReportbuilderTemplates);
End
@@ -34,9 +32,6 @@ Directory gid_Dir_Share_Reportbuilder
DosName = "reportbuilder";
End
-STD_JAR_FILE( gid_File_Jar_Reportbuilder, reportbuilder )
-STD_JAR_FILE( gid_File_Jar_Reportbuilderwizard, reportbuilderwizard )
-
File gid_File_Xcd_Reportbuilder
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Share_Registry;
commit 4a3e8aaa3199a056975bfe2f96748d742d3313b0
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Apr 17 23:28:04 2014 +0200
scp2: move ScriptProviderForJavaScript jar to AutoInstall
Change-Id: Ifbfc26c2ec8ade109c8fe7dfce70ef18d68881e2
diff --git a/Repository.mk b/Repository.mk
index 9eb2ff5..adce4a2 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -666,9 +666,14 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_bsh, \
))
endif
+ifneq ($(ENABLE_SCRIPTING_JAVASCRIPT),)
+$(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_rhino, \
+ ScriptProviderForJavaScript \
+))
+endif
+
$(eval $(call gb_Helper_register_jars,OOO, \
ConnectivityTools \
- ScriptProviderForJavaScript \
XSLTFilter \
XSLTValidate \
agenda \
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index c596b63..507128f 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -226,8 +226,6 @@ End
#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT
-STD_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript )
-
File gid_File_Rdb_Scriptproviderforjavascript
TXT_FILE_BODY;
Name = "scriptproviderforjavascript.rdb";
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index d3b27b6..6da685c 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -267,7 +267,6 @@ Module gid_Module_Optional_Extensions_Script_Provider_For_JS
MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT);
ParentID = gid_Module_Optional_Extensions;
Files = (auto_extensions_rhino_ALL,
- gid_File_Jar_Scriptproviderforjavascript,
gid_File_Rdb_Scriptproviderforjavascript );
Minimal = NO;
Default = YES;
commit 8a8a24757b980fb46d10a9f21e32c5eae1d9fd27
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Apr 17 23:26:28 2014 +0200
scp2: move ScriptProviderForBeanShell jar to AutoInstall
Change-Id: Ib792eb8a4c6fa549bb34727838181c5924e7c150
diff --git a/Repository.mk b/Repository.mk
index 540e913..9eb2ff5 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -660,9 +660,14 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,ooo, \
xmerge \
))
+ifneq ($(ENABLE_SCRIPTING_BEANSHELL),)
+$(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_bsh, \
+ ScriptProviderForBeanShell \
+))
+endif
+
$(eval $(call gb_Helper_register_jars,OOO, \
ConnectivityTools \
- ScriptProviderForBeanShell \
ScriptProviderForJavaScript \
XSLTFilter \
XSLTValidate \
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 95b94c7..c596b63 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -213,8 +213,6 @@ End
#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL
-STD_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell )
-
File gid_File_Rdb_Scriptproviderforbeanshell
TXT_FILE_BODY;
Name = "scriptproviderforbeanshell.rdb";
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index 523c21a..d3b27b6 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -250,7 +250,6 @@ Module gid_Module_Optional_Extensions_Script_Provider_For_BS
MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL);
ParentID = gid_Module_Optional_Extensions;
Files = (auto_extensions_bsh_ALL,
- gid_File_Jar_Scriptproviderforbeanshell,
gid_File_Rdb_Scriptproviderforbeanshell );
Minimal = NO;
Default = YES;
commit 559d82d9bf69eeebb02aa857657f959241c1ed8c
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Apr 17 23:07:47 2014 +0200
scp2: move Jars from module ooo to AutoInstall
Change-Id: Ide08e2da5c129f5df502ac3955738f8bfca56d41
diff --git a/Repository.mk b/Repository.mk
index 3b6f3d9..540e913 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -644,35 +644,38 @@ $(eval $(call gb_Helper_register_jars_for_install,URE,ure, \
unoloader \
))
+$(eval $(call gb_Helper_register_jars_for_install,OOO,ooo, \
+ ScriptFramework \
+ ScriptProviderForJava \
+ XMergeBridge \
+ commonwizards \
+ form \
+ $(if $(filter-out MACOSX,$(OS)),officebean) \
+ query \
+ report \
+ sdbc_hsqldb \
+ smoketest \
+ table \
+ unoil \
+ xmerge \
+))
+
$(eval $(call gb_Helper_register_jars,OOO, \
ConnectivityTools \
- ScriptFramework \
ScriptProviderForBeanShell \
- ScriptProviderForJava \
ScriptProviderForJavaScript \
- XMergeBridge \
XSLTFilter \
XSLTValidate \
- commonwizards \
agenda \
aportisdoc \
fax \
- form \
htmlsoff \
letter \
- officebean \
pexcel \
pocketword \
- query \
- report \
reportbuilder \
reportbuilderwizard \
- sdbc_hsqldb \
- smoketest \
- table \
- unoil \
web \
- xmerge \
))
$(eval $(call gb_Helper_register_jars,OXT, \
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index ac0e199..c5fbb31 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -278,61 +278,6 @@ End
#endif
-#ifdef ENABLE_JAVA
-
-#ifndef MACOSX
-
-File gid_File_Jar_Officebean
- TXT_FILE_BODY;
- Name = JARFILENAME(officebean);
- Dir = gid_Dir_Classes;
- Styles = (PACKED);
-End
-
-#endif
-
-#endif
-
-
-#ifdef ENABLE_JAVA
-STD_JAR_FILE( gid_File_Jar_Report, report )
-STD_JAR_FILE( gid_File_Jar_Smoketest, smoketest )
-STD_JAR_FILE( gid_File_Jar_Table, table )
-STD_JAR_FILE( gid_File_Jar_Form, form )
-STD_JAR_FILE( gid_File_Jar_Query, query )
-STD_JAR_FILE( gid_File_Jar_Xmerge, xmerge )
-STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge )
-#endif
-
-#ifdef ENABLE_JAVA
-STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb )
-#endif
-
-#ifdef ENABLE_JAVA
-File gid_File_Jar_Commonwizards
- TXT_FILE_BODY;
- Name = JARFILENAME(commonwizards);
- Dir = gid_Dir_Classes;
- Styles = (PACKED);
-End
-#endif
-
-#ifdef ENABLE_JAVA
-STD_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
-STD_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
-#endif
-
-#ifdef ENABLE_JAVA
-
-File gid_File_Jar_Unoil
- TXT_FILE_BODY;
- Name = "unoil.jar";
- Dir = gid_Dir_Classes;
- Styles = (PACKED);
-End
-
-#endif
-
#ifndef AIX
#ifndef DISABLE_PYUNO
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 010f3cf..7b3c2ca 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -106,24 +106,12 @@ Module gid_Module_Root_Files_3
Sortkey = "1300";
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (gid_File_Jar_Unoil,
- gid_File_Jar_Hsqldb_Sdbc,
- gid_File_Jar_Officebean,
- gid_File_Jar_Report,
- gid_File_Jar_Smoketest,
- gid_File_Jar_Table,
+ Files = (
gid_File_Jar_Letter,
- gid_File_Jar_Form,
gid_File_Wizards_Common,
gid_File_Wizards_Fax,
gid_File_Jar_Agenda,
gid_File_Jar_Web,
- gid_File_Jar_Query,
- gid_File_Jar_Commonwizards,
- gid_File_Jar_Scriptframework,
- gid_File_Jar_Scriptproviderforjava,
- gid_File_Jar_Xmerge,
- gid_File_Jar_Xmergebridge,
gid_File_Rdb_Offapi,
gid_Starregistry_Services_Rdb);
End
More information about the Libreoffice-commits
mailing list