Author: ericmaeker-guest
Date: 2012-11-03 19:54:28 +0000 (Sat, 03 Nov 2012)
New Revision: 12493
Modified:
trunk/packages/freemedforms-project/trunk/debian/changelog
trunk/packages/freemedforms-project/trunk/debian/rules
Log:
freemedforms: correcting rules (comments in code)
Modified: trunk/packages/freemedforms-project/trunk/debian/changelog
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/changelog 2012-11-02
18:42:52 UTC (rev 12492)
+++ trunk/packages/freemedforms-project/trunk/debian/changelog 2012-11-03
19:54:28 UTC (rev 12493)
@@ -10,7 +10,7 @@
* debian/rules:
* adding extra-plugins for the FreeMedForms EMR
* removing unused params for the qmake
- * reformatting dh_auto_configure step
+ * reformatting dh_auto_configure/dh_auto_build/dh_auto_install step
-- Andreas Tille <[email protected]> Tue, 01 Nov 2012 18:00:00 +0200
Modified: trunk/packages/freemedforms-project/trunk/debian/rules
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/rules 2012-11-02
18:42:52 UTC (rev 12492)
+++ trunk/packages/freemedforms-project/trunk/debian/rules 2012-11-03
19:54:28 UTC (rev 12493)
@@ -2,28 +2,41 @@
# (c) 2012, Eric Maeker, MD (fr), The FreeMedForms project, BSD 3 clause
license
# The @ in front of a command prevents make from displaying
+# The new build system of the FreeMedForms project (0.8.0) creates the
+# buildpsecs/compiling.pri
+# during the qmake step. This file differs from apps to apps, so we need
+# cache it and reuse it before doing any make steps.
+
# vars
FREEMEDFORMS_EMR:=freemedforms
FREEDIAMS:=freediams
FREEACCOUNT:=freeaccount
-QMAKE_CONFIG := "CONFIG+=LINUX_INTEGRATED" -r
+QMAKE:=qmake-qt4
+QMAKE_GLOBAL_CONFIG:="CONFIG+=LINUX_INTEGRATED"
QMAKE_FREEMEDFORMS_CONFIG := "CONFIG+=with-alerts" "CONFIG+=with-webcam"
QMAKE_SUBPROJECT_CONFIG := "CONFIG+=dontbuildlibs"
"CONFIG+=dontinstallresources" "CONFIG+=dontinstalllibs"
QMAKE_IPATH := "INSTALL_ROOT_PATH=/usr/"
+QMAKE_COMPILING:=buildspecs/compiling.pri
# func
-AUTOCONF_MAIN = $(QMAKE_CONFIG) $(QMAKE_IPATH) $(QMAKE_FREEMEDFORMS_CONFIG)
$(1).pro
-AUTOCONF_SUB = $(QMAKE_CONFIG) $(QMAKE_IPATH) $(QMAKE_SUBPROJECT_CONFIG)
$(1).pro
+AUTOCONF_MAIN = -r $(QMAKE_GLOBAL_CONFIG) $(QMAKE_IPATH)
$(QMAKE_FREEMEDFORMS_CONFIG) $(1).pro
+AUTOCONF_SUB = -r $(QMAKE_GLOBAL_CONFIG) $(QMAKE_IPATH)
$(QMAKE_SUBPROJECT_CONFIG) $(1).pro
%:
dh $@ --parallel --buildsystem=qmake_qt4 #
--dbg-package=freemedforms-project-dbg
override_dh_auto_configure:
lrelease global_resources/translations/*.ts
+
dh_auto_configure -D$(FREEMEDFORMS_EMR) -- $(call AUTOCONF_MAIN,
$(FREEMEDFORMS_EMR)) $(extra_configure_opts)
+ cp $(QMAKE_COMPILING) build/$(FREEMEDFORMS_EMR).pri
+
dh_auto_configure -D$(FREEDIAMS) -- $(call AUTOCONF_SUB, $(FREEDIAMS))
$(extra_configure_opts)
+ cp $(QMAKE_COMPILING) build/$(FREEDIAMS).pri
+
dh_auto_configure -D$(FREEACCOUNT) -- $(call AUTOCONF_SUB,
$(FREEACCOUNT)) $(extra_configure_opts)
+ cp $(QMAKE_COMPILING) build/$(FREEACCOUNT).pri
override_dh_auto_clean:
rm -Rf bin
@@ -33,15 +46,25 @@
find . -name Makefile -delete
override_dh_auto_build:
+ cp build/$(FREEMEDFORMS_EMR).pri $(QMAKE_COMPILING)
dh_auto_build -D$(FREEMEDFORMS_EMR)
+
+ cp build/$(FREEDIAMS).pri $(QMAKE_COMPILING)
dh_auto_build -D$(FREEDIAMS)
+
+ cp build/$(FREEACCOUNT).pri $(QMAKE_COMPILING)
dh_auto_build -D$(FREEACCOUNT)
override_dh_auto_install:
+ cp build/$(FREEMEDFORMS_EMR).pri $(QMAKE_COMPILING)
dh_auto_install -D$(FREEMEDFORMS_EMR) -Smakefile --
INSTALL_ROOT=$(CURDIR)/debian/tmp
+
+ cp build/$(FREEDIAMS).pri $(QMAKE_COMPILING)
dh_auto_install -D$(FREEDIAMS) -Smakefile --
INSTALL_ROOT=$(CURDIR)/debian/tmp
- dh_auto_install -D$(FREEACCOUNT) -Smakefile --
INSTALL_ROOT=$(CURDIR)/debian/tmp
+ cp build/$(FREEACCOUNT).pri $(QMAKE_COMPILING)
+ dh_auto_install -D$(FREEACCOUNT) -Smakefile --
INSTALL_ROOT=$(CURDIR)/debian/tmp
+
# Remove empty dirs
find $(CURDIR)/debian/tmp/usr/share -type d -empty -delete
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
