diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-13 13:27:41 +0200 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-13 13:27:41 +0200 |
| commit | bf9af673cc25aad48f5ac12d97b8b51dbc037d2d (patch) | |
| tree | 18604cca62f0f5570c1472dffe73779d522c440f | |
| parent | c0572a8a1b7b7419502090ee89667ba3e217e394 (diff) | |
| parent | 7dc9538972dcbdb570f724f5ec2a5c3ac780d5ef (diff) | |
CWS-TOOLING: integrate CWS ause117
| -rw-r--r-- | solenv/config/sdev300.ini | 3 | ||||
| -rw-r--r-- | solenv/inc/settings.mk | 6 | ||||
| -rw-r--r-- | solenv/inc/unxmacxi.mk | 5 |
3 files changed, 7 insertions, 7 deletions
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 38a98bd1f9b6..f91d003dc25e 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -281,12 +281,14 @@ finish CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar ILIB %LIB%$;%JDKLIB% LIB %LIB%$;%JDKLIB% + JAVA_TARGET_FLAG -target 1.4 } jdk15 { CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar ILIB %LIB%$;%JDKLIB% LIB %LIB%$;%JDKLIB% + JAVA_TARGET_FLAG -target 1.5 } l10n { @@ -298,6 +300,7 @@ finish CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar ILIB %LIB%$;%JDKLIB% LIB %LIB%$;%JDKLIB% + JAVA_TARGET_FLAG -target 1.6 } } order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 cax cap common_a diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 5601f105704f..98704e038a8e 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -173,6 +173,8 @@ JAVARESPONSE= .ENDIF .ENDIF +JAVAFLAGS+=$(JAVA_TARGET_FLAG) + #END JAVA CDEFS= @@ -818,8 +820,8 @@ L10N_MODULE*=$(SOLARSRC)$/l10n ALT_L10N_MODULE*=$(SOLARSRC)$/l10n_so .IF "$(WITH_LANG)"!="" -.INCLUDE .IGNORE: $(L10N_MODULE)/localization_present.mk -.INCLUDE .IGNORE: $(ALT_L10N_MODULE)/localization_present.mk +.INCLUDE .IGNORE: $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk +.INCLUDE .IGNORE: $(ALT_L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk # check for localizations not hosted in l10n module. if a file exists there # it won't in l10n diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk index 6a21022d4830..7c7f0a88f4f4 100644 --- a/solenv/inc/unxmacxi.mk +++ b/solenv/inc/unxmacxi.mk @@ -49,10 +49,5 @@ CFLAGSENABLESYMBOLS=-g1 CFLAGSENABLESYMBOLS=-g .ENDIF -.IF "$(SNOW_LEOPARD_10_4)"!="" -JAVACOMPILER+=-target 1.5 -.EXPORT: DYLD_INSERT_LIBRARIES -.ENDIF # "$(SNOW_LEOPARD_10_4)"!="" - # Include generic Mac OS X makefile .INCLUDE : unxmacx.mk |