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

scp2: replace PACKAGE_FILELIST_DIR macro with SDK_PACKAGE_FILELIST

Browse source 
Change-Id: I3632c618e385d3f9963637c26d94b8395d5b8cb5
This commit is contained in:
Michael Stahl 2017-06-02 15:38:28 +02:00
parent 203c12c7ce
commit fbed35762a
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scp2/AutoInstall.mk
View file

@ -43,7 +43,7 @@ $(eval $(call gb_AutoInstall_add_module,postgresqlsdbc,LIBO_LIB_FILE,,,PACKAGE_F
$(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,quickstart,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,reportbuilder,LIBO_LIB_FILE,,LIBO_JAR_FILE,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE,,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE,,SDK_PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE))

4
scp2/InstallModule_sdkoo.mk
View file

@ -11,10 +11,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/sdkoo))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/sdkoo,sdk))
$(eval $(call gb_InstallModule_add_defs,scp2/sdkoo,\
-DPACKAGE_FILELIST_DIR=FILELIST_SDK_DIR \
))
$(eval $(call gb_InstallModule_add_scpfiles,scp2/sdkoo,\
scp2/source/sdkoo/sdkoo \
))

13
scp2/inc/macros.inc
View file

@ -115,7 +115,14 @@
#define PACKAGE_FILELIST(id,name) \
File id \
Dir = PACKAGE_FILELIST_DIR; \
Dir = FILELIST_DIR; \
Name = name; \
Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED); \
End
#define SDK_PACKAGE_FILELIST(id,name) \
File id \
Dir = FILELIST_SDK_DIR; \
Name = name; \
Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED); \
End
@ -502,10 +509,6 @@ End
#endif
#endif
#if !defined PACKAGE_FILELIST_DIR
#define PACKAGE_FILELIST_DIR FILELIST_DIR
#endif
#define UI_FILELIST(name, file) \
File CONCAT2(gid_File_Share_Config_Sofficecfg_uiconfig_, name) \
TXT_FILE_BODY; \

2
solenv/gbuild/gen-autoinstall.py
View file

@ -91,7 +91,7 @@ for (gid, jarfile) in autojars:
raise Exception("invalid scp2jartemplate \"" + scp2jartemplate + "\"")
print(scp2jartemplate + "(" + gid + "," + jarfile + scp2componentcondition + ")")
scp2pkgtemplates = { "PACKAGE_FILELIST" }
scp2pkgtemplates = { "PACKAGE_FILELIST", "SDK_PACKAGE_FILELIST" }
for (gid, pkgfilelist) in autopkgs:
if not(scp2pkgtemplate in scp2pkgtemplates):
raise Exception("invalid scp2pkgtemplate \"" + scp2pkgtemplate + "\"")