diff options
| author | Gjorgji <gjorgji.petkovski@seavus.com> | 2011-11-01 09:47:40 +0100 |
|---|---|---|
| committer | Viktor Mladenovski <viktor.mladenovski@seavus.com> | 2012-05-25 14:34:31 +0200 |
| commit | 637740b7d9a5b9788e50e926b6cb459489cffa0c (patch) | |
| tree | 61f0ec39f2870f079a2001277dd9f270d0050986 | |
| parent | 6a702a0d231d02360066f718c5ef4e38431ddc8a (diff) | |
Create temp files inside the build root.
ST-Ericsson ID: 369164
ST-Ericsson FOSS-OUT ID: NA
Change-Id: I5f7558fe73e94936a62a068889b1f236a8a79821
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35831
Reviewed-by: QATOOLS
Reviewed-by: Zoran ANCEVSKI <zoran.ancevski@seavus.com>
Tested-by: Vlatko STENKOSKI
Tested-by: Aleksandar GASOSKI <aleksandar.gasoski@seavus.com>
Reviewed-by: Vlatko PISTOLOV <vlatko.pistolov@seavus.com>
Tested-by: Vlatko PISTOLOV <vlatko.pistolov@seavus.com>
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | lcmodule/Makefile | 11 | ||||
| -rwxr-xr-x[-rw-r--r--] | lcmodule/source/LCM.rc | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | source/LCDriver.rc | 4 |
5 files changed, 21 insertions, 12 deletions
@@ -1,4 +1,6 @@ lcmodule/.config +lcmodule/out +out .config cov_data cov_inter @@ -7,6 +7,7 @@ endif XALAN_PATH:=./lcmodule/tools/xalan-j_2_7_1/ LCD_CONFIG:=./source/config/ +LCD_DIR:=./ WIN_BINARIES=./win_binaries/ LIBSRC := \ @@ -248,7 +249,7 @@ configfile: $(if $(wildcard $(config_file)),,config) @echo $< > /dev/null .PHONY: config -config: BUILDFOLDER := $(if $(strip $(BUILDFOLDER)),$(BUILDFOLDER),$(shell bash -c "mktemp -d")) +config: BUILDFOLDER := $(LCD_DIR)/out config: AUTO_DIR_LIB :=$(BUILDFOLDER)/autogen/ config: LIB_x32 := $(BUILDFOLDER)/liblcdriver.so config: LIB_x64 := $(BUILDFOLDER)/liblcdriver_x64.so @@ -288,15 +289,18 @@ clean: $(if $(BUILDFOLDER), \ $(if $(LIB_x32_OBJ_DIR), \ @rm -f $(BUILDFOLDER)/$(LIB_x32_OBJ_DIR)/*.o \ - @rm -rf $(BUILDFOLDER)/$(LIB_x32_OBJ_DIR),),) + @rm -rf $(BUILDFOLDER)/$(LIB_x32_OBJ_DIR) \ + @rm -rf $(BUILDFOLDER),),) ifeq ($(LBITS),64) $(if $(BUILDFOLDER), \ $(if $(LIB_x64_OBJ_DIR), \ @rm -f $(BUILDFOLDER)/$(LIB_x64_OBJ_DIR)/*.o \ - @rm -rf $(BUILDFOLDER)/$(LIB_x64_OBJ_DIR),),) + @rm -rf $(BUILDFOLDER)/$(LIB_x64_OBJ_DIR) \ + @rm -rf $(BUILDFOLDER),),) endif $(if $(BUILDFOLDER), \ - @rm -f $(BUILDFOLDER)/*.so*,) + @rm -f $(BUILDFOLDER)/*.so* \ + @rm -rf $(BUILDFOLDER),) distclean: clean $(if $(AUTO_DIR_LIB), \ diff --git a/lcmodule/Makefile b/lcmodule/Makefile index d612a1f..0255c8b 100644 --- a/lcmodule/Makefile +++ b/lcmodule/Makefile @@ -271,7 +271,7 @@ configfile: $(if $(wildcard $(config_file)),,config) @echo $< > /dev/null .PHONY: config -config: BUILDFOLDER := $(if $(strip $(BUILDFOLDER)),$(BUILDFOLDER),$(shell bash -c "mktemp -d")) +config: BUILDFOLDER := $(LCM_PATH)/out config: LCM_AUTO_DIR:=$(BUILDFOLDER)/autogen config: AUTO_DIR_LIB:=$(LCM_AUTO_DIR)/lib config: AUTO_DIR_LOADER:=$(LCM_AUTO_DIR)/loader @@ -333,15 +333,18 @@ clean: $(if ${BUILDFOLDER}, \ $(if ${LIB_x32_OBJ_DIR}, \ @rm -f ${BUILDFOLDER}/${LIB_x32_OBJ_DIR}/*.o \ - @rm -rf ${BUILDFOLDER}/${LIB_x32_OBJ_DIR},),) + @rm -rf ${BUILDFOLDER}/${LIB_x32_OBJ_DIR} \ + @rm -rf ${BUILDFOLDER},),) ifeq ($(LBITS),64) $(if ${BUILDFOLDER}, \ $(if ${LIB_x64_OBJ_DIR}, \ @rm -f ${BUILDFOLDER}/${LIB_x64_OBJ_DIR}/*.o \ - @rm -rf ${BUILDFOLDER}/${LIB_x64_OBJ_DIR},),) + @rm -rf ${BUILDFOLDER}/${LIB_x64_OBJ_DIR} \ + @rm -rf ${BUILDFOLDER},),) endif $(if ${BUILDFOLDER}, \ - @rm -f ${BUILDFOLDER}/*.so*,) + @rm -f ${BUILDFOLDER}/*.so* \ + @rm -rf ${BUILDFOLDER},) distclean: clean $(if ${LCMLDR_INSTALLDIR}, \ diff --git a/lcmodule/source/LCM.rc b/lcmodule/source/LCM.rc index 91d79f2..a2b43d3 100644..100755 --- a/lcmodule/source/LCM.rc +++ b/lcmodule/source/LCM.rc @@ -69,7 +69,7 @@ BEGIN BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "Build date: 2011-10-19"
+ VALUE "Comments", "Build date: 2011-11-01"
VALUE "CompanyName", "STEricsson AB"
VALUE "FileDescription", "LCDriver Dynamic Link Library"
VALUE "FileVersion", "1, 0, 0, 1"
@@ -77,7 +77,7 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) STEricsson AB 2011"
VALUE "PrivateBuild", "Change-Id: Id4e7569ebe5f41806ceb9d57915acd434c27ef93"
VALUE "ProductName", "CXA1104507 Loader Communication Module"
- VALUE "ProductVersion", "PV6"
+ VALUE "ProductVersion", "PV7"
END
END
BLOCK "VarFileInfo"
diff --git a/source/LCDriver.rc b/source/LCDriver.rc index ead99a3..6ddbfde 100644..100755 --- a/source/LCDriver.rc +++ b/source/LCDriver.rc @@ -81,7 +81,7 @@ BEGIN BEGIN
BLOCK "000904b0"
BEGIN
- VALUE "Comments", "Build date: 2011-10-19"
+ VALUE "Comments", "Build date: 2011-11-01"
VALUE "CompanyName", "STEricsson AB"
VALUE "FileDescription", "LCDriver Dynamic Link Library"
VALUE "FileVersion", "1, 0, 0, 1"
@@ -89,7 +89,7 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) STEricsson AB 2011"
VALUE "PrivateBuild", "Change-Id: Id4e7569ebe5f41806ceb9d57915acd434c27ef93"
VALUE "ProductName", "CXC 173 0865, LCDriver DLL"
- VALUE "ProductVersion", "PT6"
+ VALUE "ProductVersion", "PT7"
END
END
BLOCK "VarFileInfo"
|