]>
Commit | Line | Data |
---|---|---|
94ec44bd | 1 | Index: odk/pack/gendocu/makefile.mk |
2 | =================================================================== | |
3 | RCS file: /cvs/api/odk/pack/gendocu/makefile.mk,v | |
4 | retrieving revision 1.5 | |
5 | diff -u -r1.5 makefile.mk | |
6 | --- odk/pack/gendocu/makefile.mk 10 Jun 2003 10:50:52 -0000 1.5 | |
7 | +++ odk/pack/gendocu/makefile.mk 31 Oct 2003 16:36:18 -0000 | |
8 | @@ -117,9 +117,13 @@ | |
9 | ||
10 | MY_AUTODOC=$(WRAPCMD) $(SOLARBINDIR)$/autodoc | |
11 | ||
12 | +.IF "$(SOLAR_JAVA)"!="" | |
13 | all: \ | |
14 | $(CPP_DOCU_INDEX_FILE) \ | |
15 | $(JAVA_DOCU_INDEX_FILE) | |
16 | +.ELSE | |
17 | +all: $(CPP_DOCU_INDEX_FILE) | |
18 | +.ENDIF | |
19 | ||
20 | $(CPP_DOCU_INDEX_FILE) : $(INCLUDELIST) | |
21 | +-$(MKDIRHIER) $(@:d) | |
22 | @@ -140,6 +144,8 @@ | |
23 | # +$(MY_COPY) $< $@ | |
24 | ||
25 | #$(JAVA_DOCU_INDEX_FILE) : $(JAVA_SRC_FILES) $(JAVA_BEAN_SRC_FILES) | |
26 | +.IF "$(SOLAR_JAVA)"!="" | |
27 | $(JAVA_DOCU_INDEX_FILE) : $(JAVA_SRC_FILES) | |
28 | +-$(MKDIRHIER) $(@:d) | |
29 | +javadoc -J-Xmx120m $(JAVADOCPARAMS) > $(JAVADOCLOG) | |
30 | +.ENDIF | |
31 | Index: odk/source/OOSupport/makefile.mk | |
32 | =================================================================== | |
33 | RCS file: /cvs/api/odk/source/OOSupport/makefile.mk,v | |
34 | retrieving revision 1.9.40.1 | |
35 | diff -u -r1.9.40.1 makefile.mk | |
36 | --- odk/source/OOSupport/makefile.mk 15 Aug 2003 11:34:29 -0000 1.9.40.1 | |
37 | +++ odk/source/OOSupport/makefile.mk 31 Oct 2003 16:36:18 -0000 | |
38 | @@ -72,14 +72,16 @@ | |
39 | ||
40 | .INCLUDE : settings.mk | |
41 | ||
42 | -# Files -------------------------------------------------------- | |
43 | - | |
44 | +.IF "$(SOLAR_JAVA)"=="" | |
45 | +nojava: | |
46 | + @echo "Not building odk/source/OOSupport because Java has been disabled" | |
47 | +.ENDIF | |
48 | .IF "$(OS)"=="MACOSX" | |
49 | - | |
50 | dummy: | |
51 | @echo "Nothing to build for OS $(OS)" | |
52 | +.ENDIF | |
53 | ||
54 | -.ELSE # "$(OS)"=="MACOSX" | |
55 | +# Files -------------------------------------------------------- | |
56 | ||
57 | 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 | |
58 | ||
59 | @@ -346,5 +348,3 @@ | |
60 | +-mkdir $(CLASSDIR)$/netbeans$/modules | |
61 | +cd $(CLASSDIR) && cp oosupport.jar netbeans$/modules && $(WRAPCMD) java -classpath $(CLASSPATH) MakeModule | |
62 | +cd $(CLASSDIR) && jar -uvf $(TARGETNETBEANSMODULEFILE) netbeans | |
63 | - | |
64 | -.ENDIF | |
65 | Index: odk/source/bean/native/unix/makefile.mk | |
66 | =================================================================== | |
67 | RCS file: /cvs/api/odk/source/bean/native/unix/makefile.mk,v | |
68 | retrieving revision 1.9.26.1 | |
69 | diff -u -r1.9.26.1 makefile.mk | |
70 | --- odk/source/bean/native/unix/makefile.mk 15 Aug 2003 11:34:48 -0000 1.9.26.1 | |
71 | +++ odk/source/bean/native/unix/makefile.mk 31 Oct 2003 16:36:18 -0000 | |
72 | @@ -12,12 +12,14 @@ | |
73 | ||
74 | # --- Files -------------------------------------------------------- | |
75 | ||
76 | +.IF "$(SOLAR_JAVA)"=="" || "$(OS)"=="MACOSX" | |
77 | +nojava: | |
78 | + @echo "Not building odk/source/OOSupport because Java has been disabled" | |
79 | +.ENDIF | |
80 | .IF "$(OS)"=="MACOSX" | |
81 | - | |
82 | dummy: | |
83 | @echo "Nothing to build for OS $(OS)" | |
84 | - | |
85 | -.ELSE # "$(OS)"=="MACOSX" | |
86 | +.ENDIF | |
87 | ||
88 | SLOFILES = \ | |
89 | $(SLO)$/com_sun_star_beans_LocalOfficeWindow.obj | |
90 | @@ -35,8 +37,6 @@ | |
91 | .ENDIF | |
92 | ||
93 | NO_SHL1DESCRIPTION=TRUE | |
94 | - | |
95 | -.ENDIF | |
96 | ||
97 | # --- Targets ------------------------------------------------------ | |
98 | ||
99 | Index: odk/util/check.pl | |
100 | =================================================================== | |
101 | RCS file: /cvs/api/odk/util/check.pl,v | |
102 | retrieving revision 1.3 | |
103 | diff -u -r1.3 check.pl | |
104 | --- odk/util/check.pl 30 Jun 2003 16:02:17 -0000 1.3 | |
105 | +++ odk/util/check.pl 31 Oct 2003 16:36:18 -0000 | |
106 | @@ -214,6 +214,7 @@ | |
107 | ||
108 | #check java docu, it is only a first and simple check | |
109 | # improvement required | |
110 | +if ($ENV["SOLAR_JAVA"] ne "") { | |
111 | print "check java docu: "; | |
112 | if (-d "$StartDir/docs/java/ref") { | |
113 | if (! -e "$StartDir/docs/java/ref/index.html") { | |
114 | @@ -246,6 +247,7 @@ | |
115 | $return++; | |
116 | } | |
117 | print "\n"; | |
118 | +} | |
119 | ||
120 | #check examples, it is only a first and simple check | |
121 | # improvement required |