strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scp2: move Jars from module ooo to AutoInstall

Browse source 
Change-Id: Ide08e2da5c129f5df502ac3955738f8bfca56d41
This commit is contained in:
Michael Stahl 2014-04-17 23:07:47 +02:00
parent 1ba03cff6f
commit 559d82d9bf
3 changed files with 21 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
Repository.mk
View file

@ -644,37 +644,40 @@ $(eval $(call gb_Helper_register_jars_for_install,URE,ure, \
unoloader \
))
$(eval $(call gb_Helper_register_jars,OOO, \
ConnectivityTools \
$(eval $(call gb_Helper_register_jars_for_install,OOO,ooo, \
ScriptFramework \
ScriptProviderForBeanShell \
ScriptProviderForJava \
ScriptProviderForJavaScript \
XMergeBridge \
XSLTFilter \
XSLTValidate \
commonwizards \
agenda \
aportisdoc \
fax \
form \
htmlsoff \
letter \
officebean \
pexcel \
pocketword \
$(if $(filter-out MACOSX,$(OS)),officebean) \
query \
report \
reportbuilder \
reportbuilderwizard \
sdbc_hsqldb \
smoketest \
table \
unoil \
web \
xmerge \
))
$(eval $(call gb_Helper_register_jars,OOO, \
ConnectivityTools \
ScriptProviderForBeanShell \
ScriptProviderForJavaScript \
XSLTFilter \
XSLTValidate \
agenda \
aportisdoc \
fax \
htmlsoff \
letter \
pexcel \
pocketword \
reportbuilder \
reportbuilderwizard \
web \
))
$(eval $(call gb_Helper_register_jars,OXT, \
EvolutionarySolver \
active_java \

55
scp2/source/ooo/file_ooo.scp
View file

@ -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

14
scp2/source/ooo/module_hidden_ooo.scp
View file

@ -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