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

scp2: move hsqldb to AutoInstall

Browse source 
Change-Id: Ib72e509df6df51c4a42ea56ce7b1927a051baad4
This commit is contained in:
Michael Stahl 2014-03-18 20:25:04 +01:00
parent 8475eb98be
commit 376d1b594a
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RepositoryExternal.mk
View file

@ -3090,7 +3090,7 @@ endef
else # !SYSTEM_HSQLDB
$(eval $(call gb_Helper_register_jars,OOO,\
$(eval $(call gb_Helper_register_jars_for_install,OOO,ooo, \
hsqldb \
))

2
scp2/AutoInstall.mk
View file

@ -19,7 +19,7 @@ $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,,"ISCHECKFORPRODUCTUPDATES=1"))
$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE))
$(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,python))
$(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE))

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

@ -316,9 +316,6 @@ STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge )
#endif
#ifdef ENABLE_JAVA
#ifndef SYSTEM_HSQLDB
STD_JAR_FILE( gid_File_Jar_Hsqldb, hsqldb )
#endif
STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb )
#endif