X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=tools%2Fmake%2Fconfigure;h=0771d5145e17bda5429a1603385f7f65943ff322;hb=8aa3f75cc1f16a25491abc5cd8a4ed554ad26f0d;hp=b44b5c8464c30dee808d753c114686fb7cea2aaa;hpb=4fa080a6afe2044cf81a68484e50ff95f9fe9f56;p=projects.git

diff --git a/tools/make/configure b/tools/make/configure
index b44b5c8..0771d51 100755
--- a/tools/make/configure
+++ b/tools/make/configure
@@ -9,8 +9,8 @@ function echo_usage {
 
 # to build a package you need ...
 # <package>.co: checkout commands
-# <package>.cp: copy step
-# <package>.cpp (optional): commands to setup the C++ compile environment
+# <package>.cp (optional): copy step for package production
+# <package>.cpp.sh (optional): commands to setup the C++ compile environment
 
 if [ $# -lt 2 ]
 then
@@ -37,45 +37,48 @@ then
 fi
 if [ ! -x $paket.cp ]
 then
-	echo "file $paket.cp missing or not executable."
-	exit 1
-fi
-
-# load util functions for C/C++ - build
-if [ -f $paket.cpp ]
-then
-	cpp_build=1
-	. Make/c_configure.sh
+	echo "warning: file $paket.cp missing or not executable:"
+	echo "  this file is necessary for any package production."
 fi
 
-# clean src tree and check out
-#if [ -e src ]
-#then
-#	rm -rf src
-#fi
+# clean dirs and check out
 if [ -e $paket ]
 then
 	rm -rf $paket
 fi
 rm *.stamp || true
+rm make.pre || true
 
-#mkdir -p src
+mkdir -p src
 cwd=$(pwd)
 
 # checkout
-#pushd src
-#../$paket.co $build
-#popd
+pushd src >/dev/null
+	../$paket.co $build
+popd >/dev/null
+
+# load util functions for C/C++ - build
+if [ -f $paket.cpp.sh ]
+then
+	cpp_build=1
+	. projects/tools/make/c_configure.sh
+	. $paket.cpp.sh
+fi
 
 # copy package control
 control=$(find src -name $paket.control)
 if [ -z "$control" ]
 then
-	echo "control file not found"
-	exit 1
+	echo "warning: control file not found"
+	echo "  this file is necessary for any package production."
+else	
+	sed "s/%BUILD%/$build/" $control |sed "s/%ARCH%/$ARCH/" >$paket.control
+	echo "$paket.control written."
+
+	# extract version
+	version=$(grep Version $paket.control |sed "s/Version: //")
 fi
-sed "s/%BUILD%/$build/" $control >$paket.control
-echo "$paket.control written."
+
 
 # check for postinst
 postinst=$(find src -name $paket.postinst)
@@ -84,18 +87,17 @@ then
 	ln -sf $postinst .
 fi
 
-# extract version
-version=$(grep Version $paket.control |sed "s/Version: //")
-
 # create generic make.pre, if not existing
 if [ ! -f make.pre ]
 then
 	cat  >>make.pre <<MAKE_PRE
 # mBuild make.pre script (auto generated)
 project = $paket
-version = $version
 COPY = ./$paket.cp
 MAKE_PRE
 	echo "make.pre written."
 fi
 
+# append version to make.pre
+echo "version = $version" >> make.pre
+