celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject celix git commit: CELIX-401: Add default lib64 library location for docker images to prevent build location are used
Date Tue, 25 Jul 2017 16:07:21 GMT
Repository: celix
Updated Branches:
  refs/heads/develop 0d1ef4ad9 -> fff2c5ffb


CELIX-401: Add default lib64 library location for docker images to prevent build location
are used


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/fff2c5ff
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/fff2c5ff
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/fff2c5ff

Branch: refs/heads/develop
Commit: fff2c5ffb122162489b1fea8fb757d02ff365e16
Parents: 0d1ef4a
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Tue Jul 25 18:07:12 2017 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Tue Jul 25 18:07:12 2017 +0200

----------------------------------------------------------------------
 cmake/cmake_celix/create_target_filesystem.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/fff2c5ff/cmake/cmake_celix/create_target_filesystem.sh
----------------------------------------------------------------------
diff --git a/cmake/cmake_celix/create_target_filesystem.sh b/cmake/cmake_celix/create_target_filesystem.sh
index a6c1554..611b590 100644
--- a/cmake/cmake_celix/create_target_filesystem.sh
+++ b/cmake/cmake_celix/create_target_filesystem.sh
@@ -54,10 +54,12 @@ done
 
 celix_add_file() {
 	FILE=$1
+	TO_DIR=$2
 	if [ -f ${FILE} ]
 	then #is regular file and not symlink
-
-		if [[ "${FILE}" =~ ^/.* ]]; then #absolute path
+		if [ -n "${TO_DIR}" ]; then
+			DIR=${TO_DIR}
+		elif [[ "${FILE}" =~ ^/.* ]]; then #absolute path
 			DIR=.$(dirname ${FILE})
 		else
 			DIR=$(dirname ${FILE})
@@ -86,14 +88,14 @@ celix_add_lib() {
 	LIB=$1
 	for DEP in $(ldd ${LIB} | grep lib | awk '{print $3}')
 	do
-		celix_add_file ${DEP}
+		celix_add_file ${DEP} lib64
 	done
 
 	#the ld-linux library is handled separately
 	LDLIB=$(ldd ${EXE} | grep ld-linux | awk '{print $1}')
 	if [ -n ${LDLIB} ] 
 	then
-		celix_add_file ${LDLIB}
+		celix_add_file ${LDLIB} lib64
 	fi
 }
 
@@ -101,14 +103,14 @@ celix_add_libs_for_exe() {
 	EXE=$1
 	for LIB in $(ldd ${EXE} | grep lib | awk '{print $3}')
 	do
-		celix_add_file ${LIB}
+		celix_add_file ${LIB} lib64
 	done
 
 	#the ld-linux library is handled separately
 	LDLIB=$(ldd ${EXE} | grep ld-linux | awk '{print $1}')
 	if [ -n ${LDLIB} ] 
 	then
-		celix_add_file ${LDLIB}
+		celix_add_file ${LDLIB} lib64
 	fi
 }
 
@@ -124,7 +126,7 @@ celix_add_exe() {
     #fi
 
     #Always put executables in /bin
-    DIR=bin
+	DIR=bin
 
 	mkdir -p ${DIR} 2> /dev/null
 	cp -vu ${EXE} ${DIR}/


Mime
View raw message