Skip to content

C
core
Kaydet (Commit) 2b27c964 authored tarafından Juergen Schmidt's avatar Juergen Schmidt
Dosyalara gözat
Seçenekler

#99053# change classpath settings

üst cf5ce575
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 46 deletions
odk/examples/java/ConverterServlet/Makefile
Dosyayı görüntüle @ 2b27c964
......@@ -15,16 +15,14 @@ JAVAFILES = \
CLASSFILES = $(patsubst %.java,$(OUT_CLASS)$(PS)%.class,$(JAVAFILES) )
SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),, \
$(OFFICE_CLASSES_DIR)$(PS)jurt.jar \
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)unoil.jar \
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)ridl.jar \
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)sandbox.jar \
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)juh.jar \
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)servlet.jar \
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)cos.jar \
$(PATH_SEPARATOR)$(OUT_CLASS) \
)
SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(OFFICE_CLASSES_DIR)$(PS)jurt.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)unoil.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)ridl.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)sandbox.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)juh.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)servlet.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)cos.jar\
$(PATH_SEPARATOR)$(OUT_CLASS))
# Targets
......@@ -34,7 +32,7 @@ ALL : converterservlet
include $(SETTINGS)/stdtarget.mk
$(CLASSFILES) : $(OUT) $(OUT_CLASS) $(JAVAFILES)
javac -classpath $(SDK_CLASSPATH) -d $(OUT_CLASS) $(JAVAFILES)
javac -classpath "$(SDK_CLASSPATH)" -d $(OUT_CLASS) $(JAVAFILES)
converterservlet: $(CLASSFILES)
@echo --------------------------------------------------------------------------------
......
odk/examples/java/Inspector/Makefile
Dosyayı görüntüle @ 2b27c964
......@@ -37,16 +37,14 @@ CLASSFILES = $(patsubst %.java,$(OUT_COMPONENT)$(PS)%.class,$(JAVAFILES) )
CLASSFILES += $(patsubst %.java,$(OUT_COMPONENT)$(PS)$(PACKAGE)$(PS)%.class,$(GENJAVAFILES) )
SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),,\
$(OFFICE_CLASSES_DIR)$(PS)jurt.jar\
SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(OFFICE_CLASSES_DIR)$(PS)jurt.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)unoil.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)ridl.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)sandbox.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)java_uno.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)juh.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)jut.jar\
$(PATH_SEPARATOR)$(OUT_COMPONENT)\
)
$(PATH_SEPARATOR)$(OUT_COMPONENT))
OFFICE_FILEURL = $(subst \,/,$(OFFICE_PROGRAM_PATH))
......@@ -63,7 +61,7 @@ $(OUT_COMPONENT) : $(OUT)
$(TYPEFLAG) : $(IDLFILES)
$(BIN_DIR)$(PS)idlc -I. -I$(IDL_DIR) -O$(OUT_MISC) $^
$(BIN_DIR)$(PS)regmerge $(COMPONENT_RDB) /UCR $(GENURDFILES)
$(BIN_DIR)$(PS)regmerge $(COMPONENT_RDB) / $(BIN_DIR)$(PS)$(DKREGISTRYNAME)
$(BIN_DIR)$(PS)regmerge $(COMPONENT_RDB) / $(DKREGISTRYNAME)
$(BIN_DIR)$(PS)javamaker -BUCR -Torg.OpenOffice.XInstanceInspector -O$(OUT_MISC) $(COMPONENT_RDB)
@echo bla > $@
......@@ -92,5 +90,5 @@ endif
register: $(REGISTERFLAG)
@echo --------------------------------------------------------------------------------
@echo Please use the following command to execute
@echo java -classpath $(subst \\,\,$(SDK_CLASSPATH)) Test $(OSEP)Connection$(CSEP)
@echo java -classpath "$(SDK_CLASSPATH)" Test $(OSEP)Connection$(CSEP)
@echo --------------------------------------------------------------------------------
odk/examples/java/MinimalComponent/Makefile
Dosyayı görüntüle @ 2b27c964
......@@ -37,16 +37,14 @@ CLASSFILES = $(patsubst %.java,$(OUT_COMPONENT)$(PS)%.class,$(JAVAFILES) )
CLASSFILES += $(patsubst %.java,$(OUT_COMPONENT)$(PS)$(PACKAGE)$(PS)%.class,$(GENJAVAFILES) )
SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),, \
$(OFFICE_CLASSES_DIR)$(PS)jurt.jar\
SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(OFFICE_CLASSES_DIR)$(PS)jurt.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)unoil.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)ridl.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)sandbox.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)java_uno.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)juh.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)jut.jar\
$(PATH_SEPARATOR)$(OUT_COMPONENT) \
)
$(PATH_SEPARATOR)$(OUT_COMPONENT))
OFFICE_FILEURL = $(subst \,/,$(OFFICE_PROGRAM_PATH))
......@@ -63,12 +61,12 @@ $(OUT_COMPONENT) : $(OUT)
$(TYPEFLAG) : $(IDLFILES)
$(BIN_DIR)$(PS)idlc -I. -I$(IDL_DIR) -O$(OUT_MISC) $^ MinimalComponent.idl
$(BIN_DIR)$(PS)regmerge $(COMPONENT_RDB) /UCR $(GENURDFILES) MinimalComponent.urd
$(BIN_DIR)$(PS)regmerge $(COMPONENT_RDB) / $(BIN_DIR)$(PS)$(DKREGISTRYNAME)
$(BIN_DIR)$(PS)regmerge $(COMPONENT_RDB) / $(DKREGISTRYNAME)
$(BIN_DIR)$(PS)javamaker -BUCR -O$(OUT_MISC) $(COMPONENT_RDB)
@echo bla > $@
$(JAVAFLAG) : $(OUT_COMPONENT) $(TYPEFLAG) $(JAVAFILES)
javac -classpath $(SDK_CLASSPATH) -d $(OUT_COMPONENT) $(GENJAVAFILES) $(JAVAFILES)
javac -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMPONENT) $(GENJAVAFILES) $(JAVAFILES)
@echo bla > $@
$(COMPONENTJARFLAG) : $(JAVAFLAG)
......@@ -80,7 +78,7 @@ $(REGISTERFLAG) : $(COMPONENTJARFLAG)
ifneq "$(SDK_AUTO_DEPLOYMENT)" ""
$(BIN_DIR)$(PS)regmerge $(OFFICE_PROGRAM_PATH)$(PS)applicat.rdb /UCR $(GENURDFILES) MinimalComponent.rdb
$(COPY) $(COMPONENT_JAR) "$(OFFICE_CLASSES_DIR)"
java -classpath $(SDK_CLASSPATH) com.sun.star.tools.uno.RegComp "$(URLPREFIX)$(OFFICE_FILEURL)/applicat.rdb" register "$(URLPREFIX)$(OFFICE_FILEURL)/classes/MinimalComponent.jar" com.sun.star.loader.Java2
java -classpath "$(SDK_CLASSPATH)" com.sun.star.tools.uno.RegComp "$(URLPREFIX)$(OFFICE_FILEURL)/applicat.rdb" register "$(URLPREFIX)$(OFFICE_FILEURL)/classes/MinimalComponent.jar" com.sun.star.loader.Java2
@echo bla > $@
else
@echo --------------------------------------------------------------------------------
......@@ -92,7 +90,7 @@ endif
register: $(REGISTERFLAG)
@echo --------------------------------------------------------------------------------
@echo Please use the following command to execute
@echo java -classpath $(SDK_CLASSPATH) TestMinimalComponent
@echo java -classpath "$(SDK_CLASSPATH)" TestMinimalComponent
@echo --------------------------------------------------------------------------------
run:
......
odk/examples/java/NotesAccess/Makefile
Dosyayı görüntüle @ 2b27c964
......@@ -15,15 +15,13 @@ JAVAFILES = \
CLASSFILES = $(patsubst %.java,$(OUT_CLASS)$(PS)%.class,$(JAVAFILES))
SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),,\
$(OFFICE_CLASSES_DIR)$(PS)jurt.jar \
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)unoil.jar \
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)ridl.jar \
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)sandbox.jar \
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)juh.jar \
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)Notes.jar \
$(PATH_SEPARATOR)$(OUT_CLASS)\
)
SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(OFFICE_CLASSES_DIR)$(PS)jurt.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)unoil.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)ridl.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)sandbox.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)juh.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)Notes.jar\
$(PATH_SEPARATOR)$(OUT_CLASS))
# Targets
......@@ -33,10 +31,10 @@ ALL : notesaccess
include $(SETTINGS)/stdtarget.mk
$(CLASSFILES) : $(OUT) $(OUT_CLASS) $(JAVAFILES)
javac -classpath $(SDK_CLASSPATH) -d $(OUT_CLASS) $(JAVAFILES)
javac -classpath "$(SDK_CLASSPATH)" -d $(OUT_CLASS) $(JAVAFILES)
notesaccess: $(CLASSFILES)
@echo --------------------------------------------------------------------------------
@echo Please use the following command to execute
@echo java -classpath $(subst \\,\,$(SDK_CLASSPATH)) NotesAccess $(OSEP)Connection$(CSEP) $(OSEP)Host$(CSEP) $(OSEP)User$(CSEP) $(OSEP)Password$(CSEP) $(OSEP)Database$(CSEP)
@echo java -classpath "$(SDK_CLASSPATH)" NotesAccess $(OSEP)Connection$(CSEP) $(OSEP)Host$(CSEP) $(OSEP)User$(CSEP) $(OSEP)Password$(CSEP) $(OSEP)Database$(CSEP)
@echo --------------------------------------------------------------------------------
odk/examples/java/PropertySet/Makefile
Dosyayı görüntüle @ 2b27c964
......@@ -24,16 +24,14 @@ JAVAFILES = PropTest.java
CLASSFILES = $(patsubst %.java,$(OUT_COMPONENT)$(PS)$(PACKAGE)$(PS)%.class,$(JAVAFILES))
SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),,\
$(OFFICE_CLASSES_DIR)$(PS)jurt.jar\
SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(OFFICE_CLASSES_DIR)$(PS)jurt.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)unoil.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)ridl.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)sandbox.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)java_uno.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)juh.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)jut.jar\
$(PATH_SEPARATOR)$(OUT_COMPONENT)\
)
$(PATH_SEPARATOR)$(OUT_COMPONENT))
OFFICE_FILEURL = $(subst \,/,$(OFFICE_PROGRAM_PATH))
......
odk/examples/java/ToDo/Makefile
Dosyayı görüntüle @ 2b27c964
......@@ -36,16 +36,14 @@ CLASSFILES = $(patsubst %.java,$(OUT_COMPONENT)$(PS)%.class,$(JAVAFILES))
CLASSFILES += $(patsubst %.java,$(OUT_COMPONENT)$(PS)$(PACKAGE)$(PS)%.class,$(GENJAVAFILES))
SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),,\
$(OFFICE_CLASSES_DIR)$(PS)jurt.jar\
SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(OFFICE_CLASSES_DIR)$(PS)jurt.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)unoil.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)ridl.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)sandbox.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)java_uno.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)juh.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)jut.jar\
$(PATH_SEPARATOR)$(OUT_COMPONENT)\
)
$(PATH_SEPARATOR)$(OUT_COMPONENT))
OFFICE_FILEURL = $(subst \,/,$(OFFICE_PROGRAM_PATH))
......@@ -62,12 +60,12 @@ $(OUT_COMPONENT) : $(OUT) $(OUT_CLASS)
$(TYPEFLAG) : $(IDLFILES)
$(BIN_DIR)$(PS)idlc -I. -I$(IDL_DIR) -O$(OUT_MISC) $^
$(BIN_DIR)$(PS)regmerge $(COMPONENT_RDB) /UCR $(GENURDFILES)
$(BIN_DIR)$(PS)regmerge $(COMPONENT_RDB) / $(BIN_DIR)$(PS)$(DKREGISTRYNAME)
$(BIN_DIR)$(PS)regmerge $(COMPONENT_RDB) / $(DKREGISTRYNAME)
$(BIN_DIR)$(PS)javamaker -BUCR -Torg.OpenOffice.XToDo -O$(OUT_MISC) $(COMPONENT_RDB)
@echo bla > $@
$(JAVAFLAG) : $(OUT_COMPONENT) $(TYPEFLAG) $(JAVAFILES)
javac -classpath $(SDK_CLASSPATH) -d $(OUT_COMPONENT) $(GENJAVAFILES) $(JAVAFILES)
javac -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMPONENT) $(GENJAVAFILES) $(JAVAFILES)
@echo bla > $@
$(COMPONENTJARFLAG) : $(JAVAFLAG)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment