diff options
| author | paltherr <paltherr@epfl.ch> | 2003-03-19 16:13:45 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2003-03-19 16:13:45 +0000 |
| commit | dd1df4c41ec164d6f7bed44ffada2f0b1cbfe94a (patch) | |
| tree | d9148fafecf3ed57a04ae93b516d6634cd9d64c9 /support | |
| parent | 0d66e06ff4fc94991394866c5c7967cc185dfa78 (diff) | |
| download | scala-dd1df4c41ec164d6f7bed44ffada2f0b1cbfe94a.tar.gz scala-dd1df4c41ec164d6f7bed44ffada2f0b1cbfe94a.tar.bz2 scala-dd1df4c41ec164d6f7bed44ffada2f0b1cbfe94a.zip | |
- Added cygwin support
Diffstat (limited to 'support')
| -rw-r--r-- | support/make/jc.mk | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/support/make/jc.mk b/support/make/jc.mk index dd2f235acf..4e5d77c98a 100644 --- a/support/make/jc.mk +++ b/support/make/jc.mk @@ -55,6 +55,7 @@ ############################################################################## # Defaults +JC_CYGWIN ?= $(filter CYGWIN%,$(shell uname)) JC_COMPILER ?= JAVAC JAVAC ?= javac @@ -81,20 +82,22 @@ jc_FILES = $(call JC_LOOKUP,JC_FILES) jc += $(jc_compiler) jc += $(jc_compiler_flags) jc += $(jc_FLAGS) -jc += $(jc_CLASSPATH:%=-classpath %) -jc += $(jc_SOURCEPATH:%=-sourcepath %) -jc += $(jc_BOOTCLASSPATH:%=-bootclasspath %) -jc += $(jc_EXTDIRS:%=-extdirs %) -jc += $(jc_OUTPUTDIR:%=-d %) +jc += $(jc_CLASSPATH:%=-classpath $(call JC_CYGPATH,%)) +jc += $(jc_SOURCEPATH:%=-sourcepath $(call JC_CYGPATH,%)) +jc += $(jc_BOOTCLASSPATH:%=-bootclasspath $(call JC_CYGPATH,%)) +jc += $(jc_EXTDIRS:%=-extdirs $(call JC_CYGPATH,%)) +jc += $(jc_OUTPUTDIR:%=-d $(call JC_CYGFILE,%)) jc += $(jc_ENCODING:%=-encoding %) jc += $(jc_SOURCE:%=-source %) jc += $(jc_TARGET:%=-target %) -jc += $(jc_FILES) +jc += $(jc_FILES:%=$(call JC_CYGFILE,%)) ############################################################################## # Functions JC_LOOKUP = $(if $($(target)_$(1)),$($(target)_$(1)),$($(1))) +JC_CYGPATH = $(if $(JC_CYGWIN),`cygpath -w -p $(1)`,$(1)) +JC_CYGFILE = $(if $(JC_CYGWIN),`cygpath -w $(1)`,$(1)) ############################################################################## # Rules |