From 05f504ef3b18c919c08bd455d2f585f81766f594 Mon Sep 17 00:00:00 2001 From: "Reed A. Cartwright" Date: Tue, 9 Apr 2013 00:09:25 -0700 Subject: [PATCH 1/3] remove debug info --- releng/releng.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/releng/releng.cmake b/releng/releng.cmake index 98e1612..efc3c6e 100644 --- a/releng/releng.cmake +++ b/releng/releng.cmake @@ -67,8 +67,6 @@ else() set(MAKE_BIN make) endif() -message(status "${CMAKE_DEFS}") - if(RELENG_M32) set(CMAKE_DEFS ${CMAKE_DEFS} -DCMAKE_C_FLAGS=-m32) endif() From 85f261634f0464bb4875d956b27998f0d6cf442b Mon Sep 17 00:00:00 2001 From: "Reed A. Cartwright" Date: Tue, 9 Apr 2013 01:49:51 -0700 Subject: [PATCH 2/3] fixed building source archives files in releng/releng.cmake --- releng/releng.cmake | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/releng/releng.cmake b/releng/releng.cmake index efc3c6e..af7cb9a 100644 --- a/releng/releng.cmake +++ b/releng/releng.cmake @@ -17,8 +17,21 @@ if(NOT RELENG_TAG) set(RELENG_TAG "HEAD") endif() +# Identify Temporary Directory +if(WIN32 AND NOT UNIX) + set(TMPDIR $ENV{TEMP}) + if(NOT TMPDIR) + set(TMPDIR "c:/Temp") + endif() +else() + set(TMPDIR $ENV{TMPDIR}) + if(NOT TMPDIR) + set(TMPDIR "/tmp") + endif() +endif() + string(RANDOM TMP) -set(RELENG_DIR "${CMAKE_CURRENT_BINARY_DIR}/SPAGeDi-temp/${TMP}/") +set(RELENG_DIR "${TMPDIR}/SPAGeDi-temp/${TMP}/") message(STATUS "Using ${RELENG_DIR} to build packages ...") file(MAKE_DIRECTORY "${RELENG_DIR}") From ecab3cfdca24b99faeb4cfb88c700ce4053a93e1 Mon Sep 17 00:00:00 2001 From: "Reed A. Cartwright" Date: Tue, 9 Apr 2013 02:17:20 -0700 Subject: [PATCH 3/3] Change name of temp directory Added Umask support to unix --- releng/build-rel-unix.sh | 2 ++ releng/releng.cmake | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/releng/build-rel-unix.sh b/releng/build-rel-unix.sh index 6225aa9..48b5629 100755 --- a/releng/build-rel-unix.sh +++ b/releng/build-rel-unix.sh @@ -3,6 +3,8 @@ CMAKE=cmake +umask 077 + # Process command line arguments build_toolchain= while getopts t: name; do diff --git a/releng/releng.cmake b/releng/releng.cmake index af7cb9a..9b53df0 100644 --- a/releng/releng.cmake +++ b/releng/releng.cmake @@ -31,7 +31,7 @@ else() endif() string(RANDOM TMP) -set(RELENG_DIR "${TMPDIR}/SPAGeDi-temp/${TMP}/") +set(RELENG_DIR "${TMPDIR}/spagedi-releng-${TMP}/") message(STATUS "Using ${RELENG_DIR} to build packages ...") file(MAKE_DIRECTORY "${RELENG_DIR}")