mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gbuild: fix Jar layers for WNT

Browse Source 
Change-Id: I516abd165f947c155f3e969e27f51fb093bfa8fc
This commit is contained in:
Michael Stahl
2013-09-09 14:53:36 +02:00
parent 64405aa69f
commit 3cc8feff1b
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config_host.mk.in
View File

@@ -315,6 +315,7 @@ export LIBO_SHARE_PRESETS_FOLDER=@LIBO_SHARE_PRESETS_FOLDER@
export LIBO_SHARE_RESOURCE_FOLDER=@LIBO_SHARE_RESOURCE_FOLDER@
export LIBO_URE_LIB_FOLDER=@LIBO_URE_LIB_FOLDER@
export LIBO_URE_SHARE_FOLDER=@LIBO_URE_SHARE_FOLDER@
export LIBO_URE_SHARE_JAVA_FOLDER=@LIBO_URE_SHARE_JAVA_FOLDER@
export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@
export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@
export LIBO_VERSION_MINOR=@LIBO_VERSION_MINOR@

1
configure.ac
View File

@@ -2969,6 +2969,7 @@ AC_SUBST(LIBO_SHARE_PRESETS_FOLDER)
AC_SUBST(LIBO_SHARE_RESOURCE_FOLDER)
AC_SUBST(LIBO_URE_LIB_FOLDER)
AC_SUBST(LIBO_URE_SHARE_FOLDER)
AC_SUBST(LIBO_URE_SHARE_JAVA_FOLDER)
AC_SUBST(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE)
dnl ===================================================================

4
solenv/gbuild/Jar.mk
View File

@@ -23,8 +23,8 @@ gb_Jar_JAVACOMMAND := $(JAVAINTERPRETER)
gb_Jar_JARCOMMAND := jar
gb_Jar_LAYER_DIRS := \
OOO:$(gb_PROGRAMDIRNAME)/classes \
URE:ure/share/java
OOO:$(LIBO_SHARE_JAVA_FOLDER) \
URE:$(LIBO_URE_SHARE_JAVA_FOLDER)
# location of files going to be packed into .jar file
define gb_Jar_get_workdir