Attachment #10851 for issue #21974

View | Details | Raw Unified | Return to issue 21974
Collapse All | Expand All

Lines 117-125 Link Here

(-)pack/gendocu/makefile.mk (+6 lines)
117		117
118	MY_AUTODOC=$(WRAPCMD) $(SOLARBINDIR)$/autodoc	118	MY_AUTODOC=$(WRAPCMD) $(SOLARBINDIR)$/autodoc
119		119
		120	.IF "$(SOLAR_JAVA)"!=""
120	all: \	121	all: \
121	$(CPP_DOCU_INDEX_FILE) \	122	$(CPP_DOCU_INDEX_FILE) \
122	$(JAVA_DOCU_INDEX_FILE)	123	$(JAVA_DOCU_INDEX_FILE)
		124	.ELSE
		125	all: $(CPP_DOCU_INDEX_FILE)
		126	.ENDIF
123		127
124	$(CPP_DOCU_INDEX_FILE) : $(INCLUDELIST)	128	$(CPP_DOCU_INDEX_FILE) : $(INCLUDELIST)
125	+-$(MKDIRHIER) $(@:d)	129	+-$(MKDIRHIER) $(@:d)
Lines 140-145 Link Here
140	# +$(MY_COPY) $< $@	144	# +$(MY_COPY) $< $@
141		145
142	#$(JAVA_DOCU_INDEX_FILE) : $(JAVA_SRC_FILES) $(JAVA_BEAN_SRC_FILES)	146	#$(JAVA_DOCU_INDEX_FILE) : $(JAVA_SRC_FILES) $(JAVA_BEAN_SRC_FILES)
		147	.IF "$(SOLAR_JAVA)"!=""
143	$(JAVA_DOCU_INDEX_FILE) : $(JAVA_SRC_FILES)	148	$(JAVA_DOCU_INDEX_FILE) : $(JAVA_SRC_FILES)
144	+-$(MKDIRHIER) $(@:d)	149	+-$(MKDIRHIER) $(@:d)
145	+javadoc -J-Xmx120m $(JAVADOCPARAMS) > $(JAVADOCLOG)	150	+javadoc -J-Xmx120m $(JAVADOCPARAMS) > $(JAVADOCLOG)
		151	.ENDIF





.INCLUDE : settings.mk

.IF "$(SOLAR_JAVA)"==""
nojava:
	@echo "Not building odk/source/OOSupport because Java has been disabled"
.ENDIF
.IF "$(OS)"=="MACOSX"

dummy:
	@echo "Nothing to build for OS $(OS)"
.ENDIF

# Files --------------------------------------------------------

JARFILES                = $(JARPATH)$/ridl.jar$(PATH_SEPERATOR)$(JARPATH)$/juh.jar$(PATH_SEPERATOR)$(JARPATH)$/jurt.jar$(PATH_SEPERATOR)$(JARCOMMONPATH)$/jarpackager.jar$(PATH_SEPERATOR)$(JARCOMMONPATH)$/openide.jar$(PATH_SEPERATOR)$(JARPATH)$/jakarta-regexp-1.2.jar$(PATH_SEPERATOR)$(JARCOMMONPATH)$/nbantext.jar$(PATH_SEPERATOR)$(JARCOMMONPATH)$/jhall.jar


	+-mkdir $(CLASSDIR)$/netbeans$/modules
	+cd $(CLASSDIR) && cp oosupport.jar netbeans$/modules && $(WRAPCMD) java -classpath $(CLASSPATH) MakeModule
	+cd $(CLASSDIR) && jar -uvf $(TARGETNETBEANSMODULEFILE) netbeans

.ENDIF





# --- Files --------------------------------------------------------

.IF "$(SOLAR_JAVA)"=="" || "$(OS)"=="MACOSX"
nojava:
	@echo "Not building odk/source/OOSupport because Java has been disabled"
.ENDIF
.IF "$(OS)"=="MACOSX"

dummy:
	@echo "Nothing to build for OS $(OS)"
.ENDIF
.ELSE		# "$(OS)"=="MACOSX"

SLOFILES = \
	$(SLO)$/com_sun_star_beans_LocalOfficeWindow.obj

.ENDIF

NO_SHL1DESCRIPTION=TRUE

.ENDIF

# --- Targets ------------------------------------------------------


Lines 214-219 Link Here

(-)util/check.pl (+2 lines)
214		214
215	#check java docu, it is only a first and simple check	215	#check java docu, it is only a first and simple check
216	# improvement required	216	# improvement required
		217	if ($ENV["SOLAR_JAVA"] ne "") {
217	print "check java docu: ";	218	print "check java docu: ";
218	if (-d "$StartDir/docs/java/ref") {	219	if (-d "$StartDir/docs/java/ref") {
219	if (! -e "$StartDir/docs/java/ref/index.html") {	220	if (! -e "$StartDir/docs/java/ref/index.html") {
Lines 246-251 Link Here
246	$return++;	247	$return++;
247	}	248	}
248	print "\n";	249	print "\n";
		250	}
249		251
250	#check examples, it is only a first and simple check	252	#check examples, it is only a first and simple check
251	# improvement required	253	# improvement required

Return to issue 21974

Lines 72-85 Link Here

(-)source/OOSupport/makefile.mk (-6 / +6 lines)
72		72
73	.INCLUDE : settings.mk	73	.INCLUDE : settings.mk
74		74
75	# Files --------------------------------------------------------	75	.IF "$(SOLAR_JAVA)"==""
76		76	nojava:
		77	@echo "Not building odk/source/OOSupport because Java has been disabled"
		78	.ENDIF
77	.IF "$(OS)"=="MACOSX"	79	.IF "$(OS)"=="MACOSX"
78
79	dummy:	80	dummy:
80	@echo "Nothing to build for OS $(OS)"	81	@echo "Nothing to build for OS $(OS)"
		82	.ENDIF
81		83
82	.ELSE # "$(OS)"=="MACOSX"	84	# Files --------------------------------------------------------
83		85
84	JARFILES = $(JARPATH)$/ridl.jar$(PATH_SEPERATOR)$(JARPATH)$/juh.jar$(PATH_SEPERATOR)$(JARPATH)$/jurt.jar$(PATH_SEPERATOR)$(JARCOMMONPATH)$/jarpackager.jar$(PATH_SEPERATOR)$(JARCOMMONPATH)$/openide.jar$(PATH_SEPERATOR)$(JARPATH)$/jakarta-regexp-1.2.jar$(PATH_SEPERATOR)$(JARCOMMONPATH)$/nbantext.jar$(PATH_SEPERATOR)$(JARCOMMONPATH)$/jhall.jar	86	JARFILES = $(JARPATH)$/ridl.jar$(PATH_SEPERATOR)$(JARPATH)$/juh.jar$(PATH_SEPERATOR)$(JARPATH)$/jurt.jar$(PATH_SEPERATOR)$(JARCOMMONPATH)$/jarpackager.jar$(PATH_SEPERATOR)$(JARCOMMONPATH)$/openide.jar$(PATH_SEPERATOR)$(JARPATH)$/jakarta-regexp-1.2.jar$(PATH_SEPERATOR)$(JARCOMMONPATH)$/nbantext.jar$(PATH_SEPERATOR)$(JARCOMMONPATH)$/jhall.jar
85		87
Lines 346-350 Link Here
346	+-mkdir $(CLASSDIR)$/netbeans$/modules	348	+-mkdir $(CLASSDIR)$/netbeans$/modules
347	+cd $(CLASSDIR) && cp oosupport.jar netbeans$/modules && $(WRAPCMD) java -classpath $(CLASSPATH) MakeModule	349	+cd $(CLASSDIR) && cp oosupport.jar netbeans$/modules && $(WRAPCMD) java -classpath $(CLASSPATH) MakeModule
348	+cd $(CLASSDIR) && jar -uvf $(TARGETNETBEANSMODULEFILE) netbeans	350	+cd $(CLASSDIR) && jar -uvf $(TARGETNETBEANSMODULEFILE) netbeans
349
350	.ENDIF

Lines 12-23 Link Here

(-)source/bean/native/unix/makefile.mk (-5 / +5 lines)
12		12
13	# --- Files --------------------------------------------------------	13	# --- Files --------------------------------------------------------
14		14
		15	.IF "$(SOLAR_JAVA)"=="" \|\| "$(OS)"=="MACOSX"
		16	nojava:
		17	@echo "Not building odk/source/OOSupport because Java has been disabled"
		18	.ENDIF
15	.IF "$(OS)"=="MACOSX"	19	.IF "$(OS)"=="MACOSX"
16
17	dummy:	20	dummy:
18	@echo "Nothing to build for OS $(OS)"	21	@echo "Nothing to build for OS $(OS)"
19		22	.ENDIF
20	.ELSE # "$(OS)"=="MACOSX"
21		23
22	SLOFILES = \	24	SLOFILES = \
23	$(SLO)$/com_sun_star_beans_LocalOfficeWindow.obj	25	$(SLO)$/com_sun_star_beans_LocalOfficeWindow.obj
Lines 35-42 Link Here
35	.ENDIF	37	.ENDIF
36		38
37	NO_SHL1DESCRIPTION=TRUE	39	NO_SHL1DESCRIPTION=TRUE
38
39	.ENDIF
40		40
41	# --- Targets ------------------------------------------------------	41	# --- Targets ------------------------------------------------------
42		42