[caffe] 162/249: d/rules: update custom-cuda target

[Zhou Mo]

This is an automated email from the git hooks/post-receive script.

cdluminate-guest pushed a commit to branch debian/experimental
in repository caffe.

commit 79ed3e2a87c273fdc27cbebbe89ce058c46e2cd5
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Sep 2 02:05:41 2015 +0000

    d/rules: update custom-cuda target
---
 debian/rules | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/debian/rules b/debian/rules
index 3231b42..951492b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -118,25 +118,17 @@ custom-cpu:
 	dpkg-source --before-build ./
 	dh_auto_clean --builddirectory=${CAFFE_CPU_BUILDDIR}
 	mkdir ${CAFFE_CPU_BUILDDIR}
-	#	dh_auto_configure \
-	#	     --builddirectory=${CAFFE_CPU_BUILDDIR} \
-	#	     -- $(CONFFLAG_CPU) $(CUSTOM_CONFIG)
 	cd ${CAFFE_CPU_BUILDDIR}; cmake $(CONFFLAG_CPU) $(CUSTOM_CONFIG) \
 			-DCMAKE_INSTALL_PREFIX="$(shell pwd)/debian/tmp/caffe_cpu" ..
-	#cd ${CAFFE_CPU_BUILDDIR}; make $(CUSTOM_JOBS) all caffe pycaffe test.testbin
 	dh_auto_build --builddirectory=${CAFFE_CPU_BUILDDIR} -- $(CUSTOM_JOBS) \
 			all caffe pycaffe test.testbin
 	dh_auto_test --builddirectory=${CAFFE_CPU_BUILDDIR} \
 		-- runtest LD_LIBRARY_PATH=${CAFFE_CPU_BUILDDIR}/lib/ 
-	#cd ${CAFFE_CPU_BUILDDIR}; make $(CUSTOM_JOBS) runtest \
-	#		LD_LIBRARY_PATH=${CAFFE_CPU_BUILDDIR}/lib/
 	dh_auto_install --builddirectory=${CAFFE_CUDA_BUILDDIR} \
 		-- install CMAKE_COMMAND="/usr/bin/cmake -DCMAKE_INSTALL_CONFIG_NAME=\"Release\""
-	sed -i -e 's/CaffeTargets-none.cmake/CaffeTargets-release.cmake/g' \
-		debian/libcaffe-cpu-dev.install
 	cd ${CAFFE_CPU_BUILDDIR}; cmake -DCMAKE_INSTALL_CONFIG_NAME="Release" \
 		-P cmake_install.cmake
-	cd ${CAFFE_CPU_BUILDDIR}; make $(CUSTOM_JOBS) install
+	cd ${CAFFE_CPU_BUILDDIR}; make install
 	$(RM) debian/*.symbols
 	fakeroot dh binary \
 		--package=caffe-cpu \
@@ -145,16 +137,25 @@ custom-cpu:
 		--package=python-caffe-cpu
 custom-cuda:
 	dch --local='+custom' "Custom build of caffe-cuda on `uname -a`"
+	dpkg-source --after-build ./
+	dpkg-source --before-build ./
 	dh_auto_clean --builddirectory=${CAFFE_CUDA_BUILDDIR}
-	dh_auto_configure \
-		--builddirectory=${CAFFE_CUDA_BUILDDIR} \
-		-- $(CONFFLAG_CUDA) $(CUSTOM_CONFIG)
-	dh_auto_build --builddirectory=${CAFFE_CUDA_BUILDDIR}
-	-dh_auto_test --builddirectory=${CAFFE_CUDA_BUILDDIR} \
-		-- runtest LD_LIBRARY_PATH=${CAFFE_CUDA_BUILDDIR}/lib/
-	dh_auto_install --builddirectory=${CAFFE_CUDA_BUILDDIR} -- install
+	mkdir ${CAFFE_CUDA_BUILDDIR}
+	cd ${CAFFE_CUDA_BUILDDIR}; cmake $(CONFFLAG_CPU) $(CUSTOM_CONFIG) \
+			-DCMAKE_INSTALL_PREFIX="$(shell pwd)/debian/tmp/caffe_cpu" ..
+	dh_auto_build --builddirectory=${CAFFE_CUDA_BUILDDIR} -- $(CUSTOM_JOBS) \
+			all caffe pycaffe test.testbin
+	dh_auto_test --builddirectory=${CAFFE_CUDA_BUILDDIR} \
+		-- runtest LD_LIBRARY_PATH=${CAFFE_CUDA_BUILDDIR}/lib/ 
+	dh_auto_install --builddirectory=${CAFFE_CUDA_BUILDDIR} \
+		-- install CMAKE_COMMAND="/usr/bin/cmake -DCMAKE_INSTALL_CONFIG_NAME=\"Release\""
+	cd ${CAFFE_CUDA_BUILDDIR}; cmake -DCMAKE_INSTALL_CONFIG_NAME="Release" \
+		-P cmake_install.cmake
+	#cd ${CAFFE_CUDA_BUILDDIR}; make install
+	$(RM) debian/*.symbols
 	fakeroot dh binary \
-		--package=caffe-cuda \
-		--package=libcaffe-cuda0 \
-		--package=libcaffe-cuda-dev \
-		--package=python-caffe-cuda
+		--package=caffe-cpu \
+		--package=libcaffe-cpu0 \
+		--package=libcaffe-cpu-dev \
+		--package=python-caffe-cpu
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/caffe.git