diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 16:22:39 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 16:22:39 +0000 |
| commit | af9fa48aa94e77e5eeffda01da179c1ce22eb6f3 (patch) | |
| tree | d82253af89b6b4304a216cc7b072be0240169bea /odk/settings | |
| parent | 5b00093c1a67febaf6ab74098ca872dd753815e9 (diff) | |
INTEGRATION: CWS sdksample (1.6.4); FILE MERGED
2004/10/22 13:08:26 jsc 1.6.4.5: #i35871# adapt macro
2004/10/08 13:59:45 jsc 1.6.4.4: #i29308# insert macro for package platform descr
2004/08/24 15:05:52 jsc 1.6.4.3: #i29308# insert UNO_PKG_EXT
2004/07/20 15:27:08 jsc 1.6.4.2: #i29308# use new unopkg
2004/06/02 13:02:09 jsc 1.6.4.1: #i26335# new macro for zip tool
Diffstat (limited to 'odk/settings')
| -rw-r--r-- | odk/settings/std.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/odk/settings/std.mk b/odk/settings/std.mk index 78eac183ae4d..f9b2300e9d91 100644 --- a/odk/settings/std.mk +++ b/odk/settings/std.mk @@ -4,6 +4,8 @@ else OUT=$(PRJ)/$(OS)example.out endif +UNOPKG_EXT=uno.pkg + OUT_BIN=$(OUT)/bin OUT_INC=$(OUT)/inc OUT_SLO=$(OUT)/slo @@ -16,16 +18,17 @@ IDL_DIR=$(PRJ)/idl BIN_DIR=$(PRJ)/$(PLATFORM)/bin CLASSES_DIR=$(PRJ)/classes OFFICE_CLASSES_DIR=$(subst \,/,$(OFFICE_PROGRAM_PATH))/classes -COMPONENT_PACKAGE_DIR=$(subst /,$(PS),$(OUT_BIN)) +COMP_PACKAGE_DIR=$(subst /,$(PS),$(OUT_BIN)) OFFICE_TYPE_LIBRARY=$(subst \\,\,"$(OFFICE_PROGRAM_PATH)$(PS)types.rdb") # DKREGISTRYNAME is only for compatibility reasons DKREGISTRYNAME=$(OFFICE_TYPE_LIBRARY) -DEPLOYTOOL="$(OFFICE_PROGRAM_PATH)$(PS)pkgchk" -f +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_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" |