equal
deleted
inserted
replaced
55 IFEXIST = if [ -f $(1) ]; then $(2); fi |
55 IFEXIST = if [ -f $(1) ]; then $(2); fi |
56 DEVNULL = /dev/null |
56 DEVNULL = /dev/null |
57 MKDIR = if [ ! -d $(1)]; then mkdir $(1); fi |
57 MKDIR = if [ ! -d $(1)]; then mkdir $(1); fi |
58 RMDIR = if [ -d $(1)]; then rmdir $(1); fi |
58 RMDIR = if [ -d $(1)]; then rmdir $(1); fi |
59 DELTREE = if [ -d $(1)]; then rm -fr $(1); fi |
59 DELTREE = if [ -d $(1)]; then rm -fr $(1); fi |
|
60 PATHSEARCH = $(firstword $(wildcard $(addsuffix /$(1),$(subst :, ,$(PATH))))) |
60 |
61 |
61 else |
62 else |
62 # CMD.exe definitions |
63 # CMD.exe definitions |
63 BATPREFIX = cmd /c call |
64 BATPREFIX = cmd /c call |
64 RMFILE = $(if $(wildcard $(1)),del $(call PATHFIX,$(wildcard $(1))),echo Nothing to delete from $(1) > $(DEVNULL)) |
65 RMFILE = $(if $(wildcard $(1)),del $(call PATHFIX,$(wildcard $(1))),echo Nothing to delete from $(1) > $(DEVNULL)) |
72 IFEXIST = if exist $(1) $(2) |
73 IFEXIST = if exist $(1) $(2) |
73 DEVNULL = NUL |
74 DEVNULL = NUL |
74 MKDIR = if not exist $(1) mkdir $(1) |
75 MKDIR = if not exist $(1) mkdir $(1) |
75 RMDIR = if exist $(1) rmdir $(1) |
76 RMDIR = if exist $(1) rmdir $(1) |
76 DELTREE = if exist $(1) rmdir /S/Q $(1) |
77 DELTREE = if exist $(1) rmdir /S/Q $(1) |
|
78 PATHSEARCH = $(firstword $(wildcard $(addsuffix /$(1),$(subst ;, ,$(PATH))))) |
77 |
79 |
78 endif |
80 endif |
79 |
81 |
80 ifndef QMAKE_DEFINED |
82 ifndef QMAKE_DEFINED |
81 QMAKESPEC_JAVA=$(if $(USESBS),symbian-sbsv2,symbian-abld) |
83 QMAKESPEC_JAVA=$(if $(USESBS),symbian-sbsv2,symbian-abld) |
101 # Prevent enclosing ant options from propagating to Java compilation |
103 # Prevent enclosing ant options from propagating to Java compilation |
102 export ANT_ARGS= |
104 export ANT_ARGS= |
103 export ANT_OPTS= |
105 export ANT_OPTS= |
104 BLDMAKE = perl -S bldmake.pl |
106 BLDMAKE = perl -S bldmake.pl |
105 ABLDMAKE = set MAKELEVEL=&&set MAKEFLAGS=&&set MFLAGS=&&make -r |
107 ABLDMAKE = set MAKELEVEL=&&set MAKEFLAGS=&&set MFLAGS=&&make -r |
|
108 CODESCANNER = codescanner -c $(JAVA_SRC_ROOT)/build/codescanner_high.xml -o std $(1) | perl -ne "print if /error:/;" |
106 |
109 |
107 ifdef NODEP |
110 ifdef NODEP |
108 # Makmake does not make dependency checks with this flag |
111 # Makmake does not make dependency checks with this flag |
109 export NO_DEPENDENCIES=-nd |
112 export NO_DEPENDENCIES=-nd |
110 endif |
113 endif |
257 @echo EPOCALLOWDLLDATA >> $(PROJECTDEFINEFILE) |
260 @echo EPOCALLOWDLLDATA >> $(PROJECTDEFINEFILE) |
258 endif |
261 endif |
259 endif |
262 endif |
260 |
263 |
261 generatereleasefile: |
264 generatereleasefile: |
262 ifeq ($(origin RD_JAVA_S60_RELEASE),command line) |
|
263 @echo Writing $(RD_JAVA_S60_RELEASE_FILE) ... \ |
265 @echo Writing $(RD_JAVA_S60_RELEASE_FILE) ... \ |
|
266 $(shell $(call CATCOMMAND,$(JAVA_SRC_ROOT)/build/templates/generated_header_hash.txt) > $(RD_JAVA_S60_RELEASE_FILE)) \ |
264 $(shell echo RD_JAVA_S60_RELEASE=$(RD_JAVA_S60_RELEASE)>$(RD_JAVA_S60_RELEASE_FILE)) |
267 $(shell echo RD_JAVA_S60_RELEASE=$(RD_JAVA_S60_RELEASE)>$(RD_JAVA_S60_RELEASE_FILE)) |
265 endif |
|
266 |
268 |
267 # Clean file on clean_generated |
269 # Clean file on clean_generated |
268 clean_configure: clean_conffiles |
270 clean_configure: clean_conffiles |
269 |
271 |
270 clean_conffiles: |
272 clean_conffiles: |