diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 13:36:49 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 13:36:49 +0000 |
| commit | 9d53b3321881bd54526f08a9219c539c1430f2b5 (patch) | |
| tree | 0350b0bd6f2ed731f283858ee5b1b220f1c09fa6 | |
| parent | fc0ca57f2cd649c6330171445a06b80e2143a0e9 (diff) | |
INTEGRATION: CWS jsc21 (1.10.106); FILE MERGED
2008/06/17 07:37:08 jsc 1.10.106.6: #i88797# remove unnecessary space
2008/06/11 14:38:37 sb 1.10.106.5: RESYNC: (1.10-1.11); FILE MERGED
2008/05/27 17:21:19 jsc 1.10.106.4: #i88797# adapt for new structure
2008/05/23 11:38:05 jsc 1.10.106.3: #i88797# adapted for mac
2008/05/22 07:07:57 jsc 1.10.106.2: #i88797# adapted to new structure
2008/04/30 11:34:25 jsc 1.10.106.1: #86121# update for 3 layer office
| -rw-r--r-- | odk/settings/std.mk | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/odk/settings/std.mk b/odk/settings/std.mk index 8a46fa6dd8da..570d1f89cb8c 100644 --- a/odk/settings/std.mk +++ b/odk/settings/std.mk @@ -1,5 +1,5 @@ -ifneq "$(OO_SDK_OUTPUT_DIR)" "" -OUT=$(subst \,/,$(OO_SDK_OUTPUT_DIR))/$(OO_SDK_NAME)/$(OS)example.out +ifneq "$(OO_SDK_OUT)" "" +OUT=$(subst \,/,$(OO_SDK_OUT))/$(OS)example.out else OUT=$(PRJ)/$(OS)example.out endif @@ -16,37 +16,35 @@ OUT_MISC=$(OUT)/misc OUT_OBJ=$(OUT)/obj OUT_CLASS=$(OUT)/class IDL_DIR=$(PRJ)/idl -BIN_DIR=$(PRJ)/$(PLATFORM)/bin +BIN_DIR=$(PRJ)/bin CLASSES_DIR=$(PRJ)/classes -OFFICE_CLASSES_DIR=$(subst \,/,$(OFFICE_PROGRAM_PATH))/classes +OFFICE_CLASSES_DIR=$(subst \,/,$(OFFICE_BASE_PROGRAM_PATH))/classes COMP_PACKAGE_DIR=$(subst /,$(PS),$(OUT_BIN)) -ifneq "$(OO_SDK_URE_HOME)" "" -URE_TYPES=$(subst \\,\,$(URE_MISC)$(PS)types.rdb) +SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag + +URE_TYPES="$(subst \,/,$(URE_MISC)$(PS)types.rdb)" URE_SERVICES=$(subst \\,\,$(URE_MISC)$(PS)services.rdb) -else -URE_TYPES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)types.rdb) -URE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb) -endif -OFFICE_TYPE_LIBRARY="$(URE_TYPES)" -# DKREGISTRYNAME is only for compatibility reasons -DKREGISTRYNAME=$(OFFICE_TYPE_LIBRARY) +OFFICE_TYPES="$(subst \,/,$(OFFICE_BASE_PROGRAM_PATH)$(PS)offapi.rdb)" +OFFICE_SERVICES=$(subst \\,\,$(OFFICE_BASE_PROGRAM_PATH)$(PS)services.rdb) + +OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)" DEPLOYTOOL="$(OFFICE_PROGRAM_PATH)$(PS)unopkg" add -f -SDK_JAVA="$(OO_SDK_JAVA_HOME)/bin/java" -SDK_JAVAC="$(OO_SDK_JAVA_HOME)/bin/javac" -SDK_JAR="$(OO_SDK_JAVA_HOME)/bin/jar" +SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java" +SDK_JAVAC="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/javac" +SDK_JAR="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/jar" SDK_ZIP="$(OO_SDK_ZIP_HOME)/zip" -IDLC="$(OO_SDK_HOME)/$(PLATFORM)/bin/idlc" -CPPUMAKER="$(OO_SDK_HOME)/$(PLATFORM)/bin/cppumaker" -JAVAMAKER="$(OO_SDK_HOME)/$(PLATFORM)/bin/javamaker" -REGMERGE="$(OO_SDK_HOME)/$(PLATFORM)/bin/regmerge" -REGCOMP="$(OO_SDK_HOME)/$(PLATFORM)/bin/regcomp" -XML2CMP="$(OO_SDK_HOME)/$(PLATFORM)/bin/xml2cmp" +IDLC="$(OO_SDK_HOME)/bin/idlc" +CPPUMAKER="$(OO_SDK_HOME)/bin/cppumaker" +JAVAMAKER="$(OO_SDK_HOME)/bin/javamaker" +REGMERGE="$(OO_SDK_URE_HOME)/bin/regmerge" +REGCOMP="$(OO_SDK_URE_HOME)/bin/regcomp" SDK_JAVA_UNO_BOOTSTRAP_FILES=\ -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader.class$(SQM) \ + -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$Drain.class$(SQM) \ -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$CustomURLClassLoader.class$(SQM) \ -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$Drain.class$(SQM) \ -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/InstallationFinder.class$(SQM) \ |