diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-09-11 00:42:52 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-09-11 00:50:54 +0200 |
commit | 5397b49f4dba9d065984a8b0eb356333c565217a (patch) | |
tree | 8fa65285b27907c6620bfd48457018d92d63253c /scripting | |
parent | 06b632f0d367178b7266e50c6f140ef36984733f (diff) |
Towards a working instdir for Mac OS X
Introduced gb_INSTROOT, which is the same as $(INSTDIR) except for Mac OS X,
where it is $(INSTDIR)/LibreOffice.app/Contents. Most stuff ends up there (so
most occurrences of $(INSTDIR) have been replaced with $(gb_INSTROOT)), but SDK-
related stuff goes to $(INSTDIR)/$(gb_Package_SDKDIRNAME). (And
GeneratedPackage needed to be made more flexible, to allow for packages that go
into either of those two places.)
For Android and iOS, gb_INSTROOT probably still needs to be set.
The most obvious missing thing yet to make instdir work for Mac OS X is the
instdir/*/LibreOffice.app/Contents/ure/ vs.
instdir/*/LibreOffice.app/Contents/ure-link/ split.
Change-Id: I4478edd27b14c92c96d92d5169bdca3ec50d78f5
Diffstat (limited to 'scripting')
-rw-r--r-- | scripting/Package_ScriptsBeanShell.mk | 2 | ||||
-rw-r--r-- | scripting/Package_ScriptsJavaScript.mk | 2 | ||||
-rw-r--r-- | scripting/Package_ScriptsPython.mk | 2 | ||||
-rw-r--r-- | scripting/Package_java.mk | 2 | ||||
-rw-r--r-- | scripting/Package_java_jars.mk | 2 | ||||
-rw-r--r-- | scripting/Package_scriptbindinglib.mk | 2 | ||||
-rw-r--r-- | scripting/Package_scriptproviderforpython.mk | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/scripting/Package_ScriptsBeanShell.mk b/scripting/Package_ScriptsBeanShell.mk index 44b664126cbb..8a3daf3b9329 100644 --- a/scripting/Package_ScriptsBeanShell.mk +++ b/scripting/Package_ScriptsBeanShell.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,scripting_ScriptsBeanShell,$(SRCDIR)/scripting/examples)) -$(eval $(call gb_Package_set_outdir,scripting_ScriptsBeanShell,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,scripting_ScriptsBeanShell,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsBeanShell,$(LIBO_SHARE_FOLDER)/Scripts,\ beanshell/Capitalise/capitalise.bsh \ diff --git a/scripting/Package_ScriptsJavaScript.mk b/scripting/Package_ScriptsJavaScript.mk index 8780778d1407..17519cf60b48 100644 --- a/scripting/Package_ScriptsJavaScript.mk +++ b/scripting/Package_ScriptsJavaScript.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,scripting_ScriptsJavaScript,$(SRCDIR)/scripting/examples)) -$(eval $(call gb_Package_set_outdir,scripting_ScriptsJavaScript,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,scripting_ScriptsJavaScript,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsJavaScript,$(LIBO_SHARE_FOLDER)/Scripts,\ javascript/ExportSheetsToHTML/exportsheetstohtml.js \ diff --git a/scripting/Package_ScriptsPython.mk b/scripting/Package_ScriptsPython.mk index aa9985b035eb..2f284b3627e5 100644 --- a/scripting/Package_ScriptsPython.mk +++ b/scripting/Package_ScriptsPython.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,scripting_ScriptsPython,$(SRCDIR)/scripting/examples)) -$(eval $(call gb_Package_set_outdir,scripting_ScriptsPython,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,scripting_ScriptsPython,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsPython,$(LIBO_SHARE_FOLDER)/Scripts,\ python/Capitalise.py \ diff --git a/scripting/Package_java.mk b/scripting/Package_java.mk index 7c846c0b37cd..79fb9beab077 100644 --- a/scripting/Package_java.mk +++ b/scripting/Package_java.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,scripting_java,$(SRCDIR)/scripting/examples/java)) -$(eval $(call gb_Package_set_outdir,scripting_java,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,scripting_java,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files_with_dir,scripting_java,$(LIBO_SHARE_FOLDER)/Scripts/java,\ HelloWorld/HelloWorld.java \ diff --git a/scripting/Package_java_jars.mk b/scripting/Package_java_jars.mk index eaeee8be91f1..9832a959e1e6 100644 --- a/scripting/Package_java_jars.mk +++ b/scripting/Package_java_jars.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,scripting_java_jars,$(OUTDIR)/bin)) -$(eval $(call gb_Package_set_outdir,scripting_java_jars,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,scripting_java_jars,$(gb_INSTROOT))) $(eval $(call gb_Package_add_file,scripting_java_jars,$(LIBO_SHARE_FOLDER)/Scripts/java/HelloWorld/HelloWorld.jar,HelloWorld.jar)) $(eval $(call gb_Package_add_file,scripting_java_jars,$(LIBO_SHARE_FOLDER)/Scripts/java/Highlight/Highlight.jar,Highlight.jar)) diff --git a/scripting/Package_scriptbindinglib.mk b/scripting/Package_scriptbindinglib.mk index d630058eee5a..2ebdc1045669 100644 --- a/scripting/Package_scriptbindinglib.mk +++ b/scripting/Package_scriptbindinglib.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,scripting_scriptbindinglib,$(SRCDIR)/scripting/workben/bindings)) -$(eval $(call gb_Package_set_outdir,scripting_scriptbindinglib,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,scripting_scriptbindinglib,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,scripting_scriptbindinglib,$(LIBO_SHARE_FOLDER)/basic/ScriptBindingLibrary,\ Highlight.xdl \ diff --git a/scripting/Package_scriptproviderforpython.mk b/scripting/Package_scriptproviderforpython.mk index cd2e8b6d31fb..d92dec47d643 100644 --- a/scripting/Package_scriptproviderforpython.mk +++ b/scripting/Package_scriptproviderforpython.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,scriptproviderforpython,$(SRCDIR)/scripting/source/pyprov)) -$(eval $(call gb_Package_set_outdir,scriptproviderforpython,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,scriptproviderforpython,$(gb_INSTROOT))) $(eval $(call gb_Package_add_file,scriptproviderforpython,$(LIBO_ETC_FOLDER)/services/scriptproviderforpython.rdb,scriptproviderforpython.rdb)) $(eval $(call gb_Package_add_file,scriptproviderforpython,$(LIBO_LIB_PYUNO_FOLDER)/pythonscript.py,pythonscript.py)) |