build/Makefile.defs
changeset 76 4ad59aaee882
parent 61 bf7ee68962da
child 83 26b2b12093af
equal deleted inserted replaced
69:773449708c84 76:4ad59aaee882
    40   $(error The environment variable JAVA_6_HOME is not defined)
    40   $(error The environment variable JAVA_6_HOME is not defined)
    41   endif
    41   endif
    42   export JAVA_HOME=$(JAVA_6_HOME)
    42   export JAVA_HOME=$(JAVA_6_HOME)
    43 
    43 
    44   ifeq ($(notdir $(basename $(SHELL))),sh)
    44   ifeq ($(notdir $(basename $(SHELL))),sh)
    45     # Cygwin definitions
    45     # Cygwin & Linux definitions
    46     BATPREFIX =
    46     BATPREFIX =
    47     RMFILE = rm $(call PATHFIX, $(1))
    47     RMFILE = rm $(call PATHFIX, $(1))
    48     RMFILES = $(RMFILE)
    48     RMFILES = $(RMFILE)
    49     CATCOMMAND = cat $(call PATHFIX, $(1))
    49     CATCOMMAND = cat $(call PATHFIX, $(1))
    50     PATHFIX = $(subst \,/,$(1))
    50     PATHFIX = $(subst \,/,$(1))
    51     ANT := sh ant
    51     ifeq ($(OS),Windows_NT)
       
    52       ANT := sh ant
       
    53     else
       
    54       ANT := ant
       
    55     endif
    52     SBS = MAKELEVEL=&&MAKEFLAGS=&&MFLAGS=&&sbs
    56     SBS = MAKELEVEL=&&MAKEFLAGS=&&MFLAGS=&&sbs
    53     CPPCMD = gcc -E -x assembler-with-cpp -P -undef -w -traditional-cpp
    57     CPPCMD = gcc -E -x assembler-with-cpp -P -undef -w -traditional-cpp
    54     IFNOTEXIST = if [ ! -f $(1) ]; then $(2); fi
    58     IFNOTEXIST = if [ ! -f $(1) ]; then $(2); fi
    55     IFEXIST = if [ -f $(1) ]; then $(2); fi
    59     IFEXIST = if [ -f $(1) ]; then $(2); fi
    56     DEVNULL = /dev/null
    60     DEVNULL = /dev/null
   243 
   247 
   244 configure: generateconffiles generatereleasefile
   248 configure: generateconffiles generatereleasefile
   245 generateconffiles:
   249 generateconffiles:
   246 	@echo Writing $(BUILDDEFINEFILE) ... \
   250 	@echo Writing $(BUILDDEFINEFILE) ... \
   247 	$(shell $(call CATCOMMAND,$(JAVA_SRC_ROOT)/build/templates/generated_header.txt) > $(BUILDDEFINEFILE)) \
   251 	$(shell $(call CATCOMMAND,$(JAVA_SRC_ROOT)/build/templates/generated_header.txt) > $(BUILDDEFINEFILE)) \
   248 	$(shell echo #define RD_JAVA_VERSION $(JAVA_VERSION_) >> $(BUILDDEFINEFILE)) \
   252 	$(shell echo #define RD_JAVA_VERSION $(JAVA_VERSION_)>> $(BUILDDEFINEFILE)) \
       
   253 	$(shell echo #define RD_JAVA_BIN_VERSION_NONQT $(shell python $(JAVA_SRC_ROOT)/build/buildutils/ver2binver.py mmp $(JAVA_VERSION))>> $(BUILDDEFINEFILE)) \
   249 	$(foreach d, $(PROJECT_DEFINES), $(shell echo #define $d >> $(BUILDDEFINEFILE)))
   254 	$(foreach d, $(PROJECT_DEFINES), $(shell echo #define $d >> $(BUILDDEFINEFILE)))
   250 	@echo Writing $(QBUILDDEFINEFILE) ... \
   255 	@echo Writing $(QBUILDDEFINEFILE) ... \
   251 	$(shell $(call CATCOMMAND,$(JAVA_SRC_ROOT)/build/templates/generated_header_hash.txt) > $(QBUILDDEFINEFILE)) \
   256 	$(shell $(call CATCOMMAND,$(JAVA_SRC_ROOT)/build/templates/generated_header_hash.txt) > $(QBUILDDEFINEFILE)) \
       
   257 	$(shell echo RD_JAVA_BIN_VERSION = $(shell python $(JAVA_SRC_ROOT)/build/buildutils/ver2binver.py qmake $(JAVA_VERSION))>> $(QBUILDDEFINEFILE)) \
   252 	$(shell echo PROJECT_DEFINES *= $(PROJECT_DEFINES) >> $(QBUILDDEFINEFILE))
   258 	$(shell echo PROJECT_DEFINES *= $(PROJECT_DEFINES) >> $(QBUILDDEFINEFILE))
   253 	@echo Writing $(JAVAVERSIONFILE) \
   259 	@echo Writing $(JAVAVERSIONFILE) \
   254 	$(shell echo $(JAVA_VERSION)>$(JAVAVERSIONFILE))
   260 	$(shell echo $(JAVA_VERSION)>$(JAVAVERSIONFILE))
   255 ifeq ($(BUILDENV),symbian)
   261 ifeq ($(BUILDENV),symbian)
   256 	@echo Writing $(PROJECTDEFINEFILE) ... \
   262 	@echo Writing $(PROJECTDEFINEFILE) ... \