Repository.mk | 2
RepositoryFixes.mk | 4
jvmfwk/Ant_jreproperties.mk | 27 ++++
jvmfwk/Executable_javaldx.mk | 41 +++----
jvmfwk/Library_jvmfwk.mk | 72 ++++++++++++
jvmfwk/Library_sunjavaplugin.mk | 74 +++++++++++++
jvmfwk/Makefile | 32 +++++
jvmfwk/Module_jvmfwk.mk | 58 +++-------
jvmfwk/Package_inc.mk | 28 ++++
jvmfwk/Package_javasettingsunopkginstall.mk | 26 ++++
jvmfwk/Package_javavendors.mk | 49 ++++++++
jvmfwk/Package_jvmfwk3rc.mk | 33 +++++
jvmfwk/Package_sunjavapluginrc.mk | 31 +++++
jvmfwk/inc/jvmfwk/framework.h | 43 +++----
jvmfwk/inc/jvmfwk/jvmfwkdllapi.h | 37 ++++++
jvmfwk/inc/jvmfwk/vendorplugin.h | 9 -
jvmfwk/inc/pch/precompiled_plugin.cxx | 25 ++++
jvmfwk/inc/pch/precompiled_plugin.hxx | 28 ++++
jvmfwk/java/jreproperties/build.xml | 45 +++++++
jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 2
jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx | 2
jvmfwk/plugins/sunmajor/pluginlib/makefile.mk | 113 --------------------
jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 2
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 2
jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 2
jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx | 2
jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx | 2
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx | 2
jvmfwk/prj/build.lst | 6 -
jvmfwk/prj/d.lst | 23 ----
jvmfwk/prj/makefile.mk | 41 +++----
jvmfwk/source/makefile.mk | 86 ---------------
solenv/ant/aoo-ant.xml | 4
solenv/gbuild/platform/freebsd.mk | 7 -
solenv/gbuild/platform/linux.mk | 5
solenv/gbuild/platform/macosx.mk | 7 -
solenv/gbuild/platform/windows.mk | 5
solenv/gbuild/platform/winmingw.mk | 4
38 files changed, 622 insertions(+), 359 deletions(-)
New commits:
commit 5c83d202807d82e3cf5b2962e81ac51501f73221
Author: Damjan Jovanovic <dam...@apache.org>
Date: Sun Apr 15 13:33:19 2018 +0000
Port main/jvmfwk to gbuild / Ant.
Fix the gbuild platform CPUDEFS to conform to what modules expect.
Patch by: me
diff --git a/Repository.mk b/Repository.mk
index ce8467fe768d..066bd2f1b6ff 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_Helper_register_executables,SDK, \
))
$(eval $(call gb_Helper_register_executables,UREBIN, \
+ javaldx \
regmerge \
regview \
))
@@ -179,6 +180,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
jpipe \
jpipx \
+ sunjavaplugin \
xmlreader \
))
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index cc32c9bababc..dd85ed5334df 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -38,6 +38,7 @@ gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salh
gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
spell:spell.uno%,spell:libspell.uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
store:libuno_store%,store:libstore%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
sunjavaplugin:libsunjavaplugin%,sunjavaplugin:sunjavaplugin%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
@@ -55,6 +56,7 @@ gb_Library_FILENAMES := $(patsubst
reg:libuno_reg%,reg:libreg%,$(gb_Library_FILE
gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
spell:spell.uno%,spell:libspell.uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
store:libuno_store%,store:libstore%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
sunjavaplugin:libsunjavaplugin%,sunjavaplugin:sunjavaplugin%,$(gb_Library_FILENAMES))
#$(info libnames: $(gb_Library_FILENAMES))
endif
@@ -70,6 +72,7 @@ gb_Library_FILENAMES := $(patsubst
reg:libuno_reg%,reg:libreg%,$(gb_Library_FILE
gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
spell:spell.uno%,spell:libspell.uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
store:libuno_store%,store:libstore%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
sunjavaplugin:libsunjavaplugin%,sunjavaplugin:sunjavaplugin%,$(gb_Library_FILENAMES))
ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.4) # default to use libc++
gb_Library_FILENAMES := $(patsubst
stl:%,stl:libc++.dylib,$(gb_Library_FILENAMES))
@@ -281,6 +284,7 @@ gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salh
gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
spell:spell.uno%,spell:libspell.uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
store:libuno_store%,store:libstore%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
sunjavaplugin:libsunjavaplugin%,sunjavaplugin:sunjavaplugin%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
diff --git a/jvmfwk/Ant_jreproperties.mk b/jvmfwk/Ant_jreproperties.mk
new file mode 100644
index 000000000000..d9443ed6216b
--- /dev/null
+++ b/jvmfwk/Ant_jreproperties.mk
@@ -0,0 +1,27 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call
gb_Ant_Ant,jreproperties,$(SRCDIR)/jvmfwk/java/jreproperties/build.xml,nodeliver))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk
b/jvmfwk/Executable_javaldx.mk
similarity index 63%
rename from jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk
rename to jvmfwk/Executable_javaldx.mk
index a50625ac7bfa..cfae9ae859b7 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk
+++ b/jvmfwk/Executable_javaldx.mk
@@ -21,32 +21,25 @@
-PRJ=..$/..$/..
+$(eval $(call gb_Executable_Executable,javaldx))
-PRJNAME=javaldx
-TARGET=javaldx
-TARGETTYPE=CUI
-NO_DEFAULT_STL=TRUE
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=true
+$(eval $(call gb_Library_add_package_headers,javaldx,jvmfwk_inc))
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_Executable_set_include,javaldx,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/jvmfwk/inc/ \
+ -I$(SRCDIR)/jvmfwk/inc/pch \
+))
-.INCLUDE : settings.mk
+$(eval $(call gb_Executable_add_linked_libs,javaldx,\
+ jvmfwk \
+ sal \
+ stl \
+ $(gb_STDLIBS) \
+))
-# --- Files --------------------------------------------------------
+$(eval $(call gb_Executable_add_exception_objects,javaldx,\
+ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx \
+))
-.IF "$(OS)" != "MACOSX" && "$(SOLAR_JAVA)" != ""
-
-OBJFILES=$(OBJ)$/javaldx.obj
-
-APP1TARGET=javaldx
-APP1OBJS=$(OBJFILES)
-APP1STDLIBS=$(SALLIB) $(JVMFWKLIB)
-APP1RPATH=UREBIN
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk
new file mode 100644
index 000000000000..8b0b2f44469d
--- /dev/null
+++ b/jvmfwk/Library_jvmfwk.mk
@@ -0,0 +1,72 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,jvmfwk))
+
+$(eval $(call gb_Library_add_package_headers,jvmfwk,jvmfwk_inc))
+
+$(eval $(call
gb_Library_add_precompiled_header,jvmfwk,$(SRCDIR)/jvmfwk/inc/pch/precompiled_jvmfwk))
+
+$(eval $(call
gb_Library_set_versionmap,jvmfwk,$(SRCDIR)/jvmfwk/source/framework.map))
+
+$(eval $(call gb_Library_set_include,jvmfwk,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/jvmfwk/inc/pch \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,jvmfwk, \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_defs,jvmfwk,\
+ -DJVMFWK_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,jvmfwk,\
+ cppuhelper \
+ sal \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,jvmfwk,\
+ advapi32 \
+))
+endif
+
+$(eval $(call gb_Library_use_externals,jvmfwk,\
+ libxml2 \
+))
+
+$(eval $(call gb_Library_add_exception_objects,jvmfwk,\
+ jvmfwk/source/elements \
+ jvmfwk/source/framework \
+ jvmfwk/source/fwkbase \
+ jvmfwk/source/fwkutil \
+ jvmfwk/source/libxmlutil \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk
new file mode 100644
index 000000000000..0b93b5894b82
--- /dev/null
+++ b/jvmfwk/Library_sunjavaplugin.mk
@@ -0,0 +1,74 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,sunjavaplugin))
+
+$(eval $(call gb_Library_add_package_headers,sunjavaplugin,jvmfwk_inc))
+
+$(eval $(call
gb_Library_add_precompiled_header,sunjavaplugin,$(SRCDIR)/jvmfwk/inc/pch/precompiled_plugin))
+
+$(eval $(call
gb_Library_set_versionmap,sunjavaplugin,$(SRCDIR)/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.map))
+
+$(eval $(call gb_Library_set_include,sunjavaplugin,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/jvmfwk/inc/pch \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,sunjavaplugin, \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_defs,sunjavaplugin,\
+ -DJVMFWK_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\
+ cppu \
+ cppuhelper \
+ sal \
+ salhelper \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\
+ advapi32 \
+ uwinapi \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,sunjavaplugin,\
+ jvmfwk/plugins/sunmajor/pluginlib/gnujre \
+ jvmfwk/plugins/sunmajor/pluginlib/otherjre \
+ jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin \
+ jvmfwk/plugins/sunmajor/pluginlib/sunjre \
+ jvmfwk/plugins/sunmajor/pluginlib/sunversion \
+ jvmfwk/plugins/sunmajor/pluginlib/util \
+ jvmfwk/plugins/sunmajor/pluginlib/vendorbase \
+ jvmfwk/plugins/sunmajor/pluginlib/vendorlist \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/jvmfwk/Makefile b/jvmfwk/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/jvmfwk/Makefile
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath
$(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jvmfwk/distributions/OpenOfficeorg/makefile.mk
b/jvmfwk/Module_jvmfwk.mk
similarity index 50%
rename from jvmfwk/distributions/OpenOfficeorg/makefile.mk
rename to jvmfwk/Module_jvmfwk.mk
index 40d4962f4d6d..3c364a5d68ec 100644
--- a/jvmfwk/distributions/OpenOfficeorg/makefile.mk
+++ b/jvmfwk/Module_jvmfwk.mk
@@ -21,41 +21,23 @@
-PRJ = ..$/..
-PRJNAME = jvmfwk
-TARGET = vendors_ooo
-
-.INCLUDE: settings.mk
-
-.IF "$(SOLAR_JAVA)"==""
-nojava:
- @echo "Not building jvmfwk because Java is disabled"
-.ENDIF
-
-.IF "$(SOLAR_JAVA)"!=""
-$(BIN)$/javavendors.xml: javavendors_unx.xml javavendors_wnt.xml
javavendors_macosx.xml javavendors_linux.xml
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="FREEBSD"
- -$(COPY) javavendors_freebsd.xml $(BIN)$/javavendors.xml
-.ELIF "$(OS)"=="MACOSX"
- -$(COPY) javavendors_macosx.xml $(BIN)$/javavendors.xml
-.ELIF "$(OS)"=="LINUX"
- -$(COPY) javavendors_linux.xml $(BIN)$/javavendors.xml
-.ELSE
- -$(COPY) javavendors_unx.xml $(BIN)$/javavendors.xml
-.ENDIF
-.ELIF "$(GUI)"=="WNT"
- -$(COPY) javavendors_wnt.xml $(BIN)$/javavendors.xml
-.ELIF "$(GUI)"=="OS2"
- -$(COPY) javavendors_os2.xml $(BIN)$/javavendors.xml
-.ELSE
- @echo Unsupported platform.
-.ENDIF
-
-.ENDIF # "$(SOLAR_JAVA)"!=""
-
-
-
-
-.INCLUDE: target.mk
-
+$(eval $(call gb_Module_Module,jvmfwk))
+
+$(eval $(call gb_Module_add_targets,jvmfwk,\
+ Ant_jreproperties \
+ Library_jvmfwk \
+ Library_sunjavaplugin \
+ Package_inc \
+ Package_javasettingsunopkginstall \
+ Package_javavendors \
+ Package_jvmfwk3rc \
+ Package_sunjavapluginrc \
+))
+
+ifeq ($(GUI),UNX)
+$(eval $(call gb_Module_add_targets,jvmfwk,\
+ Executable_javaldx \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/jvmfwk/Package_inc.mk b/jvmfwk/Package_inc.mk
new file mode 100644
index 000000000000..771bf6c9074f
--- /dev/null
+++ b/jvmfwk/Package_inc.mk
@@ -0,0 +1,28 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Package_Package,jvmfwk_inc,$(SRCDIR)/jvmfwk/inc))
+
+$(eval $(call
gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/framework.h,jvmfwk/framework.h))
+$(eval $(call
gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/jvmfwkdllapi.h,jvmfwk/jvmfwkdllapi.h))
+$(eval $(call
gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/vendorplugin.h,jvmfwk/vendorplugin.h))
diff --git a/jvmfwk/Package_javasettingsunopkginstall.mk
b/jvmfwk/Package_javasettingsunopkginstall.mk
new file mode 100644
index 000000000000..389249cb986b
--- /dev/null
+++ b/jvmfwk/Package_javasettingsunopkginstall.mk
@@ -0,0 +1,26 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call
gb_Package_Package,jvmfwk_javasettingsunopkginstall,$(SRCDIR)/jvmfwk/source))
+
+$(eval $(call
gb_Package_add_file,jvmfwk_javasettingsunopkginstall,bin/javasettingsunopkginstall.xml,javasettingsunopkginstall.xml))
diff --git a/jvmfwk/Package_javavendors.mk b/jvmfwk/Package_javavendors.mk
new file mode 100644
index 000000000000..05018581ca5e
--- /dev/null
+++ b/jvmfwk/Package_javavendors.mk
@@ -0,0 +1,49 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call
gb_Package_Package,jvmfwk_javavendors,$(SRCDIR)/jvmfwk/distributions))
+
+ifeq ($(GUI),UNX)
+ifeq ($(OS),FREEBSD)
+$(eval $(call
gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,OpenOfficeorg/javavendors_freebsd.xml))
+$(eval $(call
gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,OpenOfficeorg/javavendors_freebsd.xml))
+else ifeq ($(OS),MACOSX)
+$(eval $(call
gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,OpenOfficeorg/javavendors_macosx.xml))
+$(eval $(call
gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,OpenOfficeorg/javavendors_macosx.xml))
+else ifeq ($(OS),LINUX)
+$(eval $(call
gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,OpenOfficeorg/javavendors_linux.xml))
+$(eval $(call
gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,OpenOfficeorg/javavendors_linux.xml))
+else
+$(eval $(call
gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,OpenOfficeorg/javavendors_unx.xml))
+$(eval $(call
gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,OpenOfficeorg/javavendors_unx.xml))
+endif
+else ifeq ($(GUI),WNT)
+$(eval $(call
gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,OpenOfficeorg/javavendors_wnt.xml))
+$(eval $(call
gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,OpenOfficeorg/javavendors_wnt.xml))
+else ifeq ($(GUI),OS2)
+$(eval $(call
gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,OpenOfficeorg/javavendors_os2.xml))
+$(eval $(call
gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,OpenOfficeorg/javavendors_os2.xml))
+else
+gb_Output_Error(Unsupported platform.)
+endif
+
diff --git a/jvmfwk/Package_jvmfwk3rc.mk b/jvmfwk/Package_jvmfwk3rc.mk
new file mode 100644
index 000000000000..92acf0d62140
--- /dev/null
+++ b/jvmfwk/Package_jvmfwk3rc.mk
@@ -0,0 +1,33 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Package_Package,jvmfwk_jvmfwk3rc,$(SRCDIR)/jvmfwk/source))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Package_add_file,jvmfwk_jvmfwk3rc,bin/jvmfwk3.ini,jvmfwk3rc))
+else ifeq ($(GUI),OS2)
+$(eval $(call gb_Package_add_file,jvmfwk_jvmfwk3rc,bin/jvmfwk3.ini,jvmfwk3rc))
+else
+$(eval $(call gb_Package_add_file,jvmfwk_jvmfwk3rc,lib/jvmfwk3rc,jvmfwk3rc))
+endif
+
diff --git a/jvmfwk/Package_sunjavapluginrc.mk
b/jvmfwk/Package_sunjavapluginrc.mk
new file mode 100644
index 000000000000..6a96395739a1
--- /dev/null
+++ b/jvmfwk/Package_sunjavapluginrc.mk
@@ -0,0 +1,31 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call
gb_Package_Package,jvmfwk_sunjavapluginrc,$(SRCDIR)/jvmfwk/plugins/sunmajor/pluginlib))
+
+ifeq ($(GUI),WNT)
+$(eval $(call
gb_Package_add_file,jvmfwk_sunjavapluginrc,bin/sunjavaplugin.ini,sunjavapluginrc))
+else
+$(eval $(call
gb_Package_add_file,jvmfwk_sunjavapluginrc,lib/sunjavapluginrc,sunjavapluginrc))
+endif
+
diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h
index cb3a0a0f8c07..8e749e81a590 100644
--- a/jvmfwk/inc/jvmfwk/framework.h
+++ b/jvmfwk/inc/jvmfwk/framework.h
@@ -28,6 +28,7 @@
#include "rtl/ustring.h"
#include "osl/mutex.h"
+#include "jvmfwk/jvmfwkdllapi.h"
#ifdef SOLAR_JAVA
#include "jni.h"
#else
@@ -300,7 +301,7 @@ typedef struct _JavaInfo JavaInfo;
@param pInfo
The object which is to be freed. It can be NULL;
*/
-void SAL_CALL jfw_freeJavaInfo(JavaInfo *pInfo);
+JVMFWK_DLLPUBLIC void SAL_CALL jfw_freeJavaInfo(JavaInfo *pInfo);
/** compares two <code>JavaInfo</code> objects for equality.
@@ -324,7 +325,7 @@ void SAL_CALL jfw_freeJavaInfo(JavaInfo *pInfo);
sal_True - both object represent the same JRE.</br>
sal_False - the objects represend different JREs
*/
-sal_Bool SAL_CALL jfw_areEqualJavaInfo(
+JVMFWK_DLLPUBLIC sal_Bool SAL_CALL jfw_areEqualJavaInfo(
JavaInfo const * pInfoA,JavaInfo const * pInfoB);
/** determines if a Java Virtual Machine is already running.
@@ -347,7 +348,7 @@ sal_Bool SAL_CALL jfw_areEqualJavaInfo(
JFW_E_NONE function ran successfully.<br/>
JFW_E_INVALID_ARG the parameter <code>bRunning</code> was NULL.
*/
-javaFrameworkError SAL_CALL jfw_isVMRunning(sal_Bool *bRunning);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_isVMRunning(sal_Bool
*bRunning);
/** detects a suitable JRE and configures the framework to use it.
@@ -413,7 +414,7 @@ javaFrameworkError SAL_CALL jfw_isVMRunning(sal_Bool
*bRunning);
JFW_E_CONFIGURATION mode was not properly set or their prerequisites
were not met.
*/
-javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo
**pInfo);
/** provides information about all available JRE installations.
@@ -442,7 +443,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo
**pInfo);
JFW_E_CONFIGURATION mode was not properly set or their prerequisites
were not met.
*/
-javaFrameworkError SAL_CALL jfw_findAllJREs(
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_findAllJREs(
JavaInfo ***parInfo, sal_Int32 *pSize);
/** determines if a path points to a Java installation.
@@ -475,7 +476,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(
JFW_E_FAILED_VERSION a JRE was detected but if failed the version
requirements as determined by the javavendors.xml
*/
-javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
rtl_uString *pPath, JavaInfo **ppInfo);
@@ -543,7 +544,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
JFW_E_FAILED_VERSION the "Default Mode" is active. The JRE
determined by
<code>JAVA_HOME</code>does not meet the version requirements.
*/
-javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions,
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption
*arOptions,
sal_Int32 nSize, JavaVM **ppVM,
JNIEnv **ppEnv);
@@ -573,7 +574,7 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption
*arOptions,
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo const *pInfo);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo const
*pInfo);
/** provides information about the JRE that is to be used.
@@ -603,7 +604,7 @@ javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo
const *pInfo);
JFW_E_INVALID_SETTINGS the javavendors.xml has been changed and no
JRE has been selected afterwards. <br/>
*/
-javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo
**ppInfo);
/** determines if Java can be used.
@@ -622,7 +623,7 @@ javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo
**ppInfo);
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled);
/** provides the information if Java can be used.
@@ -637,7 +638,7 @@ javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool
bEnabled);
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-javaFrameworkError SAL_CALL jfw_getEnabled(sal_Bool *pbEnabled);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getEnabled(sal_Bool
*pbEnabled);
/** determines parameters which are passed to VM during its creation.
@@ -661,7 +662,7 @@ javaFrameworkError SAL_CALL jfw_getEnabled(sal_Bool
*pbEnabled);
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-javaFrameworkError SAL_CALL jfw_setVMParameters(
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setVMParameters(
rtl_uString ** arArgs, sal_Int32 nSize);
/** obtains the currently used start parameters.
@@ -686,7 +687,7 @@ javaFrameworkError SAL_CALL jfw_setVMParameters(
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-javaFrameworkError SAL_CALL jfw_getVMParameters(
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getVMParameters(
rtl_uString *** parParameters,
sal_Int32 * pSize);
@@ -708,7 +709,7 @@ javaFrameworkError SAL_CALL jfw_getVMParameters(
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-javaFrameworkError SAL_CALL jfw_setUserClassPath(rtl_uString * pCP);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setUserClassPath(rtl_uString
* pCP);
/** provides the value of the current user class path.
<p>The function returns an empty string if no user class path is set.
@@ -727,7 +728,7 @@ javaFrameworkError SAL_CALL
jfw_setUserClassPath(rtl_uString * pCP);
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-javaFrameworkError SAL_CALL jfw_getUserClassPath(rtl_uString ** ppCP);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getUserClassPath(rtl_uString
** ppCP);
/** saves the location of a JRE.
@@ -756,7 +757,7 @@ javaFrameworkError SAL_CALL
jfw_getUserClassPath(rtl_uString ** ppCP);
JFW_E_DIRECT_MODE the function cannot be used in this mode.
@see jfw_setJRELocations
*/
-javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString * sLocation);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString *
sLocation);
/** saves the locations of a number of JREs.
@@ -784,7 +785,7 @@ javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString
* sLocation);
JFW_E_DIRECT_MODE the function cannot be used in this mode.
@see jfw_addJRELocations
*/
-javaFrameworkError SAL_CALL jfw_setJRELocations(
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setJRELocations(
rtl_uString ** arLocations, sal_Int32 nSize);
/** obtains an array containing paths to JRE installations.
@@ -806,7 +807,7 @@ javaFrameworkError SAL_CALL jfw_setJRELocations(
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-javaFrameworkError SAL_CALL jfw_getJRELocations(
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getJRELocations(
rtl_uString *** parLocations, sal_Int32 * pSize);
@@ -828,7 +829,7 @@ javaFrameworkError SAL_CALL jfw_getJRELocations(
JFW_E_INVALID_ARG pInfo contains invalid data</br>
JFW_E_NO_PLUGIN a plug-in library could not be found.<br/>
*/
-javaFrameworkError SAL_CALL jfw_existJRE(const JavaInfo *pInfo, sal_Bool
*exist);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_existJRE(const JavaInfo
*pInfo, sal_Bool *exist);
/** locks this API so that it cannot be used by other threads.
@@ -846,14 +847,14 @@ javaFrameworkError SAL_CALL jfw_existJRE(const JavaInfo
*pInfo, sal_Bool *exist)
The only functions which are not effected by <code>jfw_lock</code> are
<code>jfw_freeJavaInfo</code> and <code>jfw_areEqualJavaInfo</code>.
*/
-void SAL_CALL jfw_lock();
+JVMFWK_DLLPUBLIC void SAL_CALL jfw_lock();
/** unlocks this API.
<p>This function is called after <code>jfw_lock</code>. It allows other
threads to use this API concurrently.</p>
*/
-void SAL_CALL jfw_unlock();
+JVMFWK_DLLPUBLIC void SAL_CALL jfw_unlock();
#ifdef __cplusplus
diff --git a/jvmfwk/inc/jvmfwk/jvmfwkdllapi.h b/jvmfwk/inc/jvmfwk/jvmfwkdllapi.h
new file mode 100644
index 000000000000..4293938e77ca
--- /dev/null
+++ b/jvmfwk/inc/jvmfwk/jvmfwkdllapi.h
@@ -0,0 +1,37 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#ifndef INCLUDED_JVMFWKDLLAPI_H
+#define INCLUDED_JVMFWKDLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(JVMFWK_DLLIMPLEMENTATION)
+#define JVMFWK_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define JVMFWK_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define JVMFWK_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif /* INCLUDED_JVMFWKDLLAPI_H */
+
diff --git a/jvmfwk/inc/jvmfwk/vendorplugin.h b/jvmfwk/inc/jvmfwk/vendorplugin.h
index aa516b9de732..acfeef47e7e8 100644
--- a/jvmfwk/inc/jvmfwk/vendorplugin.h
+++ b/jvmfwk/inc/jvmfwk/vendorplugin.h
@@ -26,6 +26,7 @@
#define INCLUDED_JVMFWK_VENDORPLUGIN_H
#include "jvmfwk/framework.h"
+#include "jvmfwk/jvmfwkdllapi.h"
#include "rtl/ustring.h"
#ifdef SOLAR_JAVA
#include "jni.h"
@@ -121,7 +122,7 @@ typedef enum
<code>sMinVersion,sMaxVersion,arExcludeList</code> are not recognized as
valid
version strings.
*/
-javaPluginError jfw_plugin_getAllJavaInfos(
+JVMFWK_DLLPUBLIC javaPluginError jfw_plugin_getAllJavaInfos(
rtl_uString *sVendor,
rtl_uString *sMinVersion,
rtl_uString *sMaxVersion,
@@ -172,7 +173,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
does not mean necessarily that there is no JRE. There could be a JRE but it
has
a vendor which is not supported by this API implementation.
*/
-javaPluginError jfw_plugin_getJavaInfoByPath(
+JVMFWK_DLLPUBLIC javaPluginError jfw_plugin_getJavaInfoByPath(
rtl_uString *sLocation,
rtl_uString *sVendor,
rtl_uString *sMinVersion,
@@ -225,7 +226,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
JFW_PLUGIN_E_VM_CREATION_FAILED a VM could not be created. The error was
caused
by the JRE.
*/
-javaPluginError jfw_plugin_startJavaVirtualMachine(
+JVMFWK_DLLPUBLIC javaPluginError jfw_plugin_startJavaVirtualMachine(
const JavaInfo *pInfo,
const JavaVMOption *arOptions,
sal_Int32 nSizeOptions,
@@ -251,7 +252,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
JFW_PLUGIN_E_ERROR an error occurred during execution.</br>
JFW_PLUGIN_E_INVALID_ARG pInfo contains invalid data</br>
*/
-javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
+JVMFWK_DLLPUBLIC javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo,
sal_Bool *exist);
#ifdef __cplusplus
}
diff --git a/jvmfwk/inc/pch/precompiled_plugin.cxx
b/jvmfwk/inc/pch/precompiled_plugin.cxx
new file mode 100644
index 000000000000..4f48f4601dfe
--- /dev/null
+++ b/jvmfwk/inc/pch/precompiled_plugin.cxx
@@ -0,0 +1,25 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#include "precompiled_plugin.hxx"
+
diff --git a/jvmfwk/inc/pch/precompiled_plugin.hxx
b/jvmfwk/inc/pch/precompiled_plugin.hxx
new file mode 100644
index 000000000000..6d8f2d4bc1e7
--- /dev/null
+++ b/jvmfwk/inc/pch/precompiled_plugin.hxx
@@ -0,0 +1,28 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:50.576954
+
+#ifdef PRECOMPILED_HEADERS
+#endif
+
diff --git a/jvmfwk/java/jreproperties/build.xml
b/jvmfwk/java/jreproperties/build.xml
new file mode 100644
index 000000000000..36e8899487e6
--- /dev/null
+++ b/jvmfwk/java/jreproperties/build.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+
+
+<project name="jreproperties" default="main">
+
+ <property file="../../../ant.properties"/>
+ <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>
+
+ <!-- custom delivery: JREProperties.class must be in ${OUTDIR}/bin and
${OUTDIR}/lib -->
+ <!-- The JAR is irrelevant and only there to make gbuild happy. -->
+
+ <target name="main" depends="jar">
+ <copy file="${main.build.dir}/JREProperties.class"
+ tofile="${OUTDIR}/bin/JREProperties.class"/>
+ <copy file="${main.build.dir}/JREProperties.class"
+ tofile="${OUTDIR}/lib/JREProperties.class"/>
+ </target>
+
+ <target name="clean-delivered-class" extensionOf="pre-clean">
+ <delete file="${OUTDIR}/bin/JREProperties.class"/>
+ <delete file="${OUTDIR}/lib/JREProperties.class"/>
+ </target>
+
+</project>
+
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
b/jvmfwk/java/jreproperties/src/main/java/JREProperties.java
similarity index 100%
rename from jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
rename to jvmfwk/java/jreproperties/src/main/java/JREProperties.java
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index eb1f94ab88fa..5c0f0164675d 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_jvmfwk.hxx"
+#include "precompiled_plugin.hxx"
#include <stdio.h>
#include <stdlib.h>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
index 4f75f3486067..f11b9f85cfa4 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_jvmfwk.hxx"
+#include "precompiled_plugin.hxx"
#include "osl/file.hxx"
#include "osl/thread.h"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
deleted file mode 100644
index d1adbfbe5b46..000000000000
--- a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
+++ /dev/null
@@ -1,113 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-PRJ=..$/..$/..
-
-PRJNAME= jvmfwk
-
-TARGET = plugin
-
-ENABLE_EXCEPTIONS=TRUE
-
-LIBTARGET=NO
-
-UNOCOMPONENT1=sunjavaplugin
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE =
-
-# ------------------------------------------------------------------
-
-#.INCLUDE : ..$/cppumaker.mk
-.IF "$(SOLAR_JAVA)"!=""
-
-SLOFILES= \
- $(SLO)$/sunversion.obj \
- $(SLO)$/sunjavaplugin.obj \
- $(SLO)$/vendorbase.obj \
- $(SLO)$/util.obj \
- $(SLO)$/sunjre.obj \
- $(SLO)$/gnujre.obj \
- $(SLO)$/vendorlist.obj \
- $(SLO)$/otherjre.obj
-
-LIB1OBJFILES= $(SLOFILES)
-
-
-
-LIB1TARGET=$(SLB)$/$(UNOCOMPONENT1).lib
-
-SHL1TARGET= $(UNOCOMPONENT1)
-
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(CPPUHELPER) \
- $(SALLIB) \
- $(SALHELPERLIB)
-
-
-.IF "$(GUI)" == "WNT"
-.IF "$(COM)"!="GCC"
-SHL1STDLIBS += uwinapi.lib advapi32.lib
-.ELSE
-SHL1STDLIBS += -luwinapi -ladvapi32
-.ENDIF # GCC
-.ENDIF #WNT
-
-SHL1VERSIONMAP = sunjavaplugin.map
-SHL1DEPN=
-SHL1IMPLIB= i$(UNOCOMPONENT1)
-SHL1LIBS= $(LIB1TARGET)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME= $(SHL1TARGET)
-SHL1RPATH= URELIB
-
-JAVACLASSFILES= \
- $(CLASSDIR)$/JREProperties.class
-
-JAVAFILES = $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES)))
-
-.ENDIF # SOLAR_JAVA
-
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(GUI)"=="WNT"
-BOOTSTRAPFILE=$(BIN)$/sunjavaplugin.ini
-.ELSE
-BOOTSTRAPFILE=$(BIN)$/sunjavapluginrc
-.ENDIF
-
-
-$(BOOTSTRAPFILE): sunjavapluginrc
- -$(COPY) $< $@
-
-
-ALLTAR: \
- $(BOOTSTRAPFILE)
-
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
index ac0e3e276e97..84dfedfaedd9 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_jvmfwk.hxx"
+#include "precompiled_plugin.hxx"
#include "osl/thread.h"
#include "otherjre.hxx"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 98860a98caa6..7ef21a27d767 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_jvmfwk.hxx"
+#include "precompiled_plugin.hxx"
#if OSL_DEBUG_LEVEL > 0
#include <stdio.h>
#endif
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 1c8fa981b691..2f636561ad07 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_jvmfwk.hxx"
+#include "precompiled_plugin.hxx"
#include "osl/thread.h"
#include "sunjre.hxx"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index c92231e14de6..a9c98ddae024 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_jvmfwk.hxx"
+#include "precompiled_plugin.hxx"
#include "sunversion.hxx"
#include "osl/thread.h"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index fdec57696b91..42e1c554a11d 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_jvmfwk.hxx"
+#include "precompiled_plugin.hxx"
#include "osl/file.hxx"
#include "osl/diagnose.h"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index c70961c63259..1a0aff1eb983 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_jvmfwk.hxx"
+#include "precompiled_plugin.hxx"
#include "vendorlist.hxx"
#include "gnujre.hxx"
diff --git a/jvmfwk/prj/build.lst b/jvmfwk/prj/build.lst
index bd09aae41774..b3fa63141384 100644
--- a/jvmfwk/prj/build.lst
+++ b/jvmfwk/prj/build.lst
@@ -1,6 +1,2 @@
jvmf jvmfwk : cppu cppuhelper sal LIBXML2:libxml2 NULL
-jvmf jvmfwk\inc nmake - all jvmf_inc NULL
-jvmf jvmfwk\source nmake - all jvmf_framework jvmf_inc NULL
-jvmf jvmfwk\plugins\sunmajor\pluginlib nmake - all jvmf_sunmajorlib jvmf_inc
NULL
-jvmf jvmfwk\plugins\sunmajor\javaenvsetup nmake - u jvmf_sunjavaldx
jvmf_framework jvmf_inc NULL
-jvmf jvmfwk\distributions\OpenOfficeorg nmake - all jvmf_openoffice
jvmf_framework jvmf_inc NULL
+jvmf jvmfwk\prj nmake - all jvmf_prj NULL
diff --git a/jvmfwk/prj/d.lst b/jvmfwk/prj/d.lst
index e5c3f593518a..e69de29bb2d1 100644
--- a/jvmfwk/prj/d.lst
+++ b/jvmfwk/prj/d.lst
@@ -1,23 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\jvmfwk
-..\inc\jvmfwk\framework.h %_DEST%\inc%_EXT%\jvmfwk\framework.h
-..\inc\jvmfwk\vendorplugin.h %_DEST%\inc%_EXT%\jvmfwk\vendorplugin.h
-..\%__SRC%\lib\ijvmfwk.lib %_DEST%\lib%_EXT%\ijvmfwk.lib
-..\%__SRC%\lib\jvmfwk*.lib %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\libjvmfwk.*.* %_DEST%\lib%_EXT%\*
-..\%__SRC%\bin\jvmfwk*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\sunjavap*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\sunjavaplugin*.so %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\sunjavaplugin*.dylib %_DEST%\lib%_EXT%\*
-..\%__SRC%\class\JREProperties.class %_DEST%\bin%_EXT%\JREProperties.class
-..\%__SRC%\class\JREProperties.class %_DEST%\lib%_EXT%\JREProperties.class
-..\%__SRC%\bin\javaldx %_DEST%\bin%_EXT%\javaldx
-..\source\javasettingsunopkginstall.xml
%_DEST%\bin%_EXT%\javasettingsunopkginstall.xml
-..\%__SRC%\bin\javavendors.xml %_DEST%\bin%_EXT%\javavendors.xml
-..\%__SRC%\bin\javavendors.xml %_DEST%\lib%_EXT%\javavendors.xml
-..\%__SRC%\bin\jvmfwk3rc %_DEST%\lib%_EXT%\jvmfwk3rc
-..\%__SRC%\bin\jvmfwk3.ini %_DEST%\bin%_EXT%\jvmfwk3.ini
-..\%__SRC%\bin\sunjavapluginrc %_DEST%\lib%_EXT%\sunjavapluginrc
-..\%__SRC%\bin\sunjavaplugin.ini %_DEST%\bin%_EXT%\sunjavaplugin.ini
-
-linklib: libjvmfwk.*.*
-linklib: libjvmfwk*.dylib.*.*.*
diff --git a/jvmfwk/inc/makefile.mk b/jvmfwk/prj/makefile.mk
similarity index 69%
rename from jvmfwk/inc/makefile.mk
rename to jvmfwk/prj/makefile.mk
index 05861d12ea35..c62c6a657d16 100644
--- a/jvmfwk/inc/makefile.mk
+++ b/jvmfwk/prj/makefile.mk
@@ -20,24 +20,25 @@
#**************************************************************
-PRJ=..
-
-PRJNAME=jvmfwk
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
$(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/jvmfwk/source/makefile.mk b/jvmfwk/source/makefile.mk
deleted file mode 100644
index 76e867ec6dde..000000000000
--- a/jvmfwk/source/makefile.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ = ..
-PRJNAME = jvmfwk
-FRAMEWORKLIB=jvmfwk
-TARGET = $(FRAMEWORKLIB)
-ENABLE_EXCEPTIONS = TRUE
-
-.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2"
-UNIXVERSIONNAMES = UDK
-.ENDIF # WNT
-
-.INCLUDE: settings.mk
-
-.IF "$(SYSTEM_LIBXML)" == "YES"
-CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
-.ENDIF
-
-UNOUCROUT = $(OUT)$/inc
-
-SLOFILES = \
- $(SLO)$/framework.obj \
- $(SLO)$/libxmlutil.obj \
- $(SLO)$/fwkutil.obj \
- $(SLO)$/elements.obj \
- $(SLO)$/fwkbase.obj
-
-
-#LIB1TARGET=$(SLB)$/$(FRAMEWORKLIB).lib
-
-.IF "$(UNIXVERSIONNAMES)" == ""
-SHL1TARGET = $(FRAMEWORKLIB)$(UDK_MAJOR)
-.ELSE # UNIXVERSIONNAMES
-SHL1TARGET = $(FRAMEWORKLIB)
-.ENDIF # UNIXVERSIONNAMES
-
-#SHL1TARGET=$(FRAMEWORKLIB)
-SHL1DEPN=
-SHL1IMPLIB = i$(FRAMEWORKLIB)
-SHL1LIBS = $(SLB)$/$(TARGET).lib
-SHL1STDLIBS = $(CPPUHELPERLIB) $(SALLIB) $(LIBXML2LIB)
-SHL1RPATH = URELIB
-
-.IF "$(OS)" == "WNT"
-SHL1STDLIBS += $(ADVAPI32LIB)
-.ENDIF # WNT
-
-SHL1VERSIONMAP = framework.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME = $(SHL1TARGET)
-
-.IF "$(GUI)"=="UNX"
-RCFILE=$(BIN)$/jvmfwk3rc
-.ELIF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
-RCFILE=$(BIN)$/jvmfwk3.ini
-.END
-
-
-.INCLUDE: target.mk
-$(RCFILE): jvmfwk3rc
- -$(COPY) $< $@
-
-ALLTAR: \
- $(RCFILE)
-
diff --git a/solenv/ant/aoo-ant.xml b/solenv/ant/aoo-ant.xml
index d8b91b2d7dec..963257cc26d6 100644
--- a/solenv/ant/aoo-ant.xml
+++ b/solenv/ant/aoo-ant.xml
@@ -197,7 +197,9 @@
</jar>
</target>
- <target name="clean" depends="prepare">
+ <extension-point name="pre-clean" depends="prepare"/>
+
+ <target name="clean" depends="pre-clean">
<delete dir="${build.base.dir}"/>
<delete file="${jar.dir}/${jar.name}.jar"/>
</target>
diff --git a/solenv/gbuild/platform/freebsd.mk
b/solenv/gbuild/platform/freebsd.mk
index 74fea0cbb4e6..d519cb8c2386 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -61,12 +61,9 @@ gb_COMPILERDEFS := \
-DHAVE_GCC_VISIBILITY_FEATURE \
-DCPPU_ENV=$(COMNAME) \
-ifeq ($(CPUNAME),X86_64)
-gb_CPUDEFS := -D$(CPUNAME)
-else ifeq ($(CPUNAME),POWERPC64)
gb_CPUDEFS := -D$(CPUNAME)
-else
-gb_CPUDEFS := -DX86
+ifeq ($(CPUNAME),INTEL)
+gb_CPUDEFS += -DX86
endif
gb_CFLAGS := \
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index df237d96601b..8ae6a5e005ba 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -58,10 +58,9 @@ gb_COMPILERDEFS := \
-DHAVE_GCC_VISIBILITY_FEATURE \
-DCPPU_ENV=$(COMNAME) \
-ifeq ($(CPUNAME),X86_64)
gb_CPUDEFS := -D$(CPUNAME)
-else
-gb_CPUDEFS := -DX86
+ifeq ($(CPUNAME),INTEL)
+gb_CPUDEFS += -DX86
endif
gb_CFLAGS := \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index a460cbb7767f..8497342ddaf6 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -59,12 +59,11 @@ gb_COMPILERDEFS := \
-DHAVE_GCC_VISIBILITY_FEATURE \
-DCPPU_ENV=$(COMNAME) \
+gb_CPUDEFS := -D$(CPUNAME)
ifeq ($(CPUNAME),POWERPC)
-gb_CPUDEFS := -DPOWERPC -DPPC
+gb_CPUDEFS += -DPOWERPC -DPPC
else ifeq ($(CPUNAME),INTEL)
-gb_CPUDEFS := -DX86
-else ifeq ($(CPUNAME),X86_64)
-gb_CPUDEFS := -DX86_64
+gb_CPUDEFS += -DX86
endif
ifeq ($(strip $(SYSBASE)),)
diff --git a/solenv/gbuild/platform/windows.mk
b/solenv/gbuild/platform/windows.mk
index 7e793775c38b..5f8baab0d52c 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -63,11 +63,12 @@ gb_COMPILERDEFS := \
-DFULL_DESK \
-DM1500 \
+gb_CPUDEFS := -D$(CPUNAME)
ifeq ($(CPUNAME),INTEL)
-gb_CPUDEFS := -DINTEL -D_X86_=1
+gb_CPUDEFS += -D_X86_=1
endif
ifeq ($(CPUNAME),X86_64)
-gb_CPUDEFS := -DX86_64 -D_AMD64_=1
+gb_CPUDEFS += -D_AMD64_=1
endif
gb_RCDEFS := \
diff --git a/solenv/gbuild/platform/winmingw.mk
b/solenv/gbuild/platform/winmingw.mk
index a684b12e535e..f48ae6caac23 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -87,8 +87,8 @@ ifeq ($(USE_MINGW),cygwin-w64-mingw32)
gb_COMPILERDEFS +=-D_declspec=__declspec
endif
-gb_CPUDEFS := \
- -DINTEL \
+gb_CPUDEFS := -D$(CPUNAME)
+gb_CPUDEFS += \
-D_M_IX86 \
gb_RCDEFS := \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
