Skip to content

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

#87796# changes for spaces in pathes

üst 43431583
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 28 deletions
odk/examples/java/Inspector/Makefile
Dosyayı görüntüle @ 06f5dd48
...@@ -30,14 +30,14 @@ PACKAGE = org$(PS)OpenOffice ...@@ -30,14 +30,14 @@ PACKAGE = org$(PS)OpenOffice
JAVAFILES = InstanceInspector.java \ JAVAFILES = InstanceInspector.java \
Test.java Test.java
GENJAVAFILES = $(patsubst %.idl,$(OUT_MISC)$(PS)$(PACKAGE)$(PS)%.java,$(IDLFILES) ) GENJAVAFILES = $(patsubst %.idl,$(OUT_MISC)$(PS)$(PACKAGE)$(PS)%.java,$(IDLFILES))
GENURDFILES = $(patsubst %.idl,$(OUT_MISC)$(PS)%.urd,$(IDLFILES) ) GENURDFILES = $(subst \\,\,$(patsubst %.idl,$(OUT_MISC)$(PS)%.urd,$(IDLFILES)))
CLASSFILES = $(patsubst %.java,$(OUT_COMPONENT)$(PS)%.class,$(JAVAFILES) ) CLASSFILES = $(patsubst %.java,$(OUT_COMPONENT)$(PS)%.class,$(JAVAFILES) )
CLASSFILES += $(patsubst %.java,$(OUT_COMPONENT)$(PS)$(PACKAGE)$(PS)%.class,$(GENJAVAFILES) ) CLASSFILES += $(patsubst %.java,$(OUT_COMPONENT)$(PS)$(PACKAGE)$(PS)%.class,$(GENJAVAFILES) )
DK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),, \ DK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),,\
$(CLASSES_DIR)$(PS)jurt.jar\ $(CLASSES_DIR)$(PS)jurt.jar\
$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)unoil.jar\ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)unoil.jar\
$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)ridl.jar\ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)ridl.jar\
...@@ -45,11 +45,11 @@ DK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),, \ ...@@ -45,11 +45,11 @@ DK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),, \
$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)java_uno.jar\ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)java_uno.jar\
$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)juh.jar\ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)juh.jar\
$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)jut.jar\ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)jut.jar\
$(PATH_SEPARATOR)$(OUT_COMPONENT) \ $(PATH_SEPARATOR)$(OUT_COMPONENT)\
) )
OFFICE_FILEURL = $(subst \,/,$(OFFICE_PROGRAM_PATH)) OFFICE_FILEURL = $(subst \,/,$(OFFICE_PROGRAM_PATH))
OFFICE_CLASSPATH = $(subst $(CLASSES_DIR),$(OFFICE_PROGRAM_PATH)$(PS)classes, $(DK_CLASSPATH)) OFFICE_CLASSPATH = $(subst \\,\,$(subst $(CLASSES_DIR),$(OFFICE_PROGRAM_PATH)$(PS)classes,$(DK_CLASSPATH)))
# Targets # Targets
...@@ -69,7 +69,7 @@ $(TYPEFLAG) : $(IDLFILES) ...@@ -69,7 +69,7 @@ $(TYPEFLAG) : $(IDLFILES)
@echo bla > $@ @echo bla > $@
$(JAVAFLAG) : $(OUT_COMPONENT) $(TYPEFLAG) $(JAVAFILES) $(JAVAFLAG) : $(OUT_COMPONENT) $(TYPEFLAG) $(JAVAFILES)
javac -classpath $(DK_CLASSPATH) -d $(OUT_COMPONENT) $(GENJAVAFILES) $(JAVAFILES) javac -classpath "$(DK_CLASSPATH)" -d $(OUT_COMPONENT) $(GENJAVAFILES) $(JAVAFILES)
@echo bla > $@ @echo bla > $@
$(COMPONENTJARFLAG) : $(JAVAFLAG) $(COMPONENTJARFLAG) : $(JAVAFLAG)
...@@ -79,9 +79,9 @@ $(COMPONENTJARFLAG) : $(JAVAFLAG) ...@@ -79,9 +79,9 @@ $(COMPONENTJARFLAG) : $(JAVAFLAG)
$(REGISTERFLAG) : $(COMPONENTJARFLAG) $(REGISTERFLAG) : $(COMPONENTJARFLAG)
ifneq "$(OFFICE_PROGRAM_PATH)" "" ifneq "$(OFFICE_PROGRAM_PATH)" ""
$(BIN_DIR)$(PS)regmerge $(OFFICE_PROGRAM_PATH)$(PS)applicat.rdb /UCR $(GENURDFILES) $(BIN_DIR)$(PS)regmerge "$(URLPREFIX)$(OFFICE_FILEURL)/applicat.rdb" /UCR $(GENURDFILES)
$(COPY) $(COMPONENT_JAR) $(OFFICE_PROGRAM_PATH)$(PS)classes $(COPY) $(COMPONENT_JAR) "$(OFFICE_PROGRAM_PATH)/classes"
java -classpath $(OFFICE_CLASSPATH) com.sun.star.tools.uno.RegComp "$(URLPREFIX)$(OFFICE_FILEURL)/applicat.rdb" register "$(URLPREFIX)$(OFFICE_FILEURL)/classes/InstanceInspector.jar" com.sun.star.loader.Java2 java -classpath "$(OFFICE_CLASSPATH)" com.sun.star.tools.uno.RegComp "$(URLPREFIX)$(OFFICE_FILEURL)/applicat.rdb" register "$(URLPREFIX)$(OFFICE_FILEURL)/classes/InstanceInspector.jar" com.sun.star.loader.Java2
@echo bla > $@ @echo bla > $@
else else
@echo -------------------------------------------------------------------------------- @echo --------------------------------------------------------------------------------
...@@ -93,8 +93,5 @@ endif ...@@ -93,8 +93,5 @@ endif
register: $(REGISTERFLAG) register: $(REGISTERFLAG)
@echo -------------------------------------------------------------------------------- @echo --------------------------------------------------------------------------------
@echo Please use the following command to execute @echo Please use the following command to execute
@echo java -classpath $(DK_CLASSPATH) Test @echo java -classpath $(subst \\,\,$(DK_CLASSPATH)) Test
@echo -------------------------------------------------------------------------------- @echo --------------------------------------------------------------------------------
run:
java -classpath $(DK_CLASSPATH) Test
odk/examples/java/NotesAccess/Makefile
Dosyayı görüntüle @ 06f5dd48
...@@ -11,18 +11,18 @@ include $(SETTINGS)/std.mk ...@@ -11,18 +11,18 @@ include $(SETTINGS)/std.mk
# Define non-platform/compiler specific settings # Define non-platform/compiler specific settings
JAVAFILES = \ JAVAFILES = \
NotesAccess.java \ NotesAccess.java
CLASSFILES = $(patsubst %.java,$(OUT_CLASS)$(PS)%.class,$(JAVAFILES) ) CLASSFILES = $(patsubst %.java,$(OUT_CLASS)$(PS)%.class,$(JAVAFILES))
DK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),, \ DK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),,\
$(CLASSES_DIR)$(PS)jurt.jar \ $(CLASSES_DIR)$(PS)jurt.jar \
$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)unoil.jar \ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)unoil.jar \
$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)ridl.jar \ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)ridl.jar \
$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)sandbox.jar \ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)sandbox.jar \
$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)juh.jar \ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)juh.jar \
$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)Notes.jar \ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)Notes.jar \
$(PATH_SEPARATOR)$(OUT_CLASS) \ $(PATH_SEPARATOR)$(OUT_CLASS)\
) )
...@@ -38,7 +38,7 @@ $(CLASSFILES) : $(OUT) $(OUT_CLASS) $(JAVAFILES) ...@@ -38,7 +38,7 @@ $(CLASSFILES) : $(OUT) $(OUT_CLASS) $(JAVAFILES)
notesaccess: $(CLASSFILES) notesaccess: $(CLASSFILES)
@echo -------------------------------------------------------------------------------- @echo --------------------------------------------------------------------------------
@echo Please use the following command to execute @echo Please use the following command to execute
@echo java -classpath $(DK_CLASSPATH) NotesAccess @echo java -classpath $(subst \\,\,$(DK_CLASSPATH)) NotesAccess
@echo -------------------------------------------------------------------------------- @echo --------------------------------------------------------------------------------
run : run :
......
odk/examples/java/ToDo/Makefile
Dosyayı görüntüle @ 06f5dd48
...@@ -29,14 +29,14 @@ PACKAGE = org$(PS)OpenOffice ...@@ -29,14 +29,14 @@ PACKAGE = org$(PS)OpenOffice
JAVAFILES = ToDo.java JAVAFILES = ToDo.java
GENJAVAFILES = $(patsubst %.idl,$(OUT_MISC)$(PS)$(PACKAGE)$(PS)%.java,$(IDLFILES) ) GENJAVAFILES = $(patsubst %.idl,$(OUT_MISC)$(PS)$(PACKAGE)$(PS)%.java,$(IDLFILES))
GENURDFILES = $(patsubst %.idl,$(OUT_MISC)$(PS)%.urd,$(IDLFILES) ) GENURDFILES = $(subst \\,\,$(patsubst %.idl,$(OUT_MISC)$(PS)%.urd,$(IDLFILES)))
CLASSFILES = $(patsubst %.java,$(OUT_COMPONENT)$(PS)%.class,$(JAVAFILES) ) CLASSFILES = $(patsubst %.java,$(OUT_COMPONENT)$(PS)%.class,$(JAVAFILES))
CLASSFILES += $(patsubst %.java,$(OUT_COMPONENT)$(PS)$(PACKAGE)$(PS)%.class,$(GENJAVAFILES) ) CLASSFILES += $(patsubst %.java,$(OUT_COMPONENT)$(PS)$(PACKAGE)$(PS)%.class,$(GENJAVAFILES))
DK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),, \ DK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),,\
$(CLASSES_DIR)$(PS)jurt.jar\ $(CLASSES_DIR)$(PS)jurt.jar\
$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)unoil.jar\ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)unoil.jar\
$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)ridl.jar\ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)ridl.jar\
...@@ -44,11 +44,11 @@ DK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),, \ ...@@ -44,11 +44,11 @@ DK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),, \
$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)java_uno.jar\ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)java_uno.jar\
$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)juh.jar\ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)juh.jar\
$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)jut.jar\ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)jut.jar\
$(PATH_SEPARATOR)$(OUT_COMPONENT) \ $(PATH_SEPARATOR)$(OUT_COMPONENT)\
) )
OFFICE_FILEURL = $(subst \,/,$(OFFICE_PROGRAM_PATH)) OFFICE_FILEURL = $(subst \,/,$(OFFICE_PROGRAM_PATH))
OFFICE_CLASSPATH = $(subst $(CLASSES_DIR),$(OFFICE_PROGRAM_PATH)$(PS)classes, $(DK_CLASSPATH)) OFFICE_CLASSPATH = $(subst \\,\,$(subst $(CLASSES_DIR),$(OFFICE_PROGRAM_PATH)$(PS)classes,$(DK_CLASSPATH)))
# Targets # Targets
...@@ -78,9 +78,9 @@ $(COMPONENTJARFLAG) : $(JAVAFLAG) ...@@ -78,9 +78,9 @@ $(COMPONENTJARFLAG) : $(JAVAFLAG)
$(REGISTERFLAG) : $(COMPONENTJARFLAG) $(REGISTERFLAG) : $(COMPONENTJARFLAG)
ifneq "$(OFFICE_PROGRAM_PATH)" "" ifneq "$(OFFICE_PROGRAM_PATH)" ""
$(BIN_DIR)$(PS)regmerge $(OFFICE_PROGRAM_PATH)$(PS)applicat.rdb /UCR $(GENURDFILES) $(BIN_DIR)$(PS)regmerge "$(URLPREFIX)$(OFFICE_FILEURL)/applicat.rdb" /UCR $(GENURDFILES)
$(COPY) $(COMPONENT_JAR) $(OFFICE_PROGRAM_PATH)$(PS)classes $(COPY) $(COMPONENT_JAR) "$(OFFICE_PROGRAM_PATH)/classes"
java -classpath $(OFFICE_CLASSPATH) com.sun.star.tools.uno.RegComp "$(URLPREFIX)$(OFFICE_FILEURL)/applicat.rdb" register "$(URLPREFIX)$(OFFICE_FILEURL)/classes/ToDo.jar" com.sun.star.loader.Java2 java -classpath "$(OFFICE_CLASSPATH)" com.sun.star.tools.uno.RegComp "$(URLPREFIX)$(OFFICE_FILEURL)/applicat.rdb" register "$(URLPREFIX)$(OFFICE_FILEURL)/classes/ToDo.jar" com.sun.star.loader.Java2
@echo bla > $@ @echo bla > $@
else else
@echo -------------------------------------------------------------------------------- @echo --------------------------------------------------------------------------------
......
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