From: Konrad Rosenbaum Date: Sat, 14 Apr 2012 22:24:38 +0000 (+0200) Subject: building qtscript X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=21996e34c4ba81ef10140045079a62ffea66285a;p=web%2Fkonrad%2Flocaldeb.git building qtscript --- diff --git a/qtscript-local/Makefile b/qtscript-local/Makefile index fe6e42b..2cd34ca 100644 --- a/qtscript-local/Makefile +++ b/qtscript-local/Makefile @@ -6,19 +6,32 @@ all: build CPUS=$(shell expr `cat /proc/cpuinfo |grep ^processor |tail -1|cut -f 2 -d :` + 1) JOPT=$(shell test $(CPUS) -gt 1 && expr $(CPUS) + 1 || echo $(CPUS)) DIR=qtscriptgenerator -QMAKE=/usr/local/qt/bin/qmake +QTDIR=/usr/local/qt +QMAKE=$(QTDIR)/bin/qmake config: cd $(DIR)/generator ; $(QMAKE) build: - cd $(DIR) ; make -j $(JOPT) + cd $(DIR)/generator ; make -j $(JOPT) && QTDIR=$(QTDIR) ./generator + cd $(DIR)/qtbindings ; qmake -recursive && make -j $(JOPT) + cd $(DIR)/qtbindings/qs_eval ; qmake && make + cd $(DIR)/tools/qsexec/src ; qmake && make install: - echo hmm, should install something + mkdir -p debian/qtscript4-local/usr/local/qt/bin + cp -ra $(DIR)/plugins debian/qtscript4-local/usr/local/qt/plugins + cp $(DIR)/qtbindings/qs_eval/qs_eval debian/qtscript4-local/usr/local/qt/bin + cp $(DIR)/tools/qsexec/qsexec debian/qtscript4-local/usr/local/qt/bin + cd debian/qtscript4-local/usr/local/bin ; ln -s ../qt/bin/* . distclean clean: -make -C $(DIR)/generator $@ + -make -C $(DIR)/qtbindings $@ + -make -C $(DIR)/qtbindings/qs_eval $@ + -make -C $(DIR)/tools/qsexec $@ + -rm $(DIR)/doc/*.html + -rm -rf $(DIR)/plugins $(DIR)/generated_cpp %: @echo "Making empty rule" $@ diff --git a/qtscript-local/build.sh b/qtscript-local/build.sh index 0749ebf..52553c1 100755 --- a/qtscript-local/build.sh +++ b/qtscript-local/build.sh @@ -7,7 +7,7 @@ URL=git://gitorious.org/qt-labs/qtscriptgenerator.git QMAKE=/usr/local/qt/bin/qmake #download qtscriptgenerator -test -d $DIR && git clone $URL || ( cd $DIR ; git pull ; ) +test -d $DIR && ( cd $DIR ; git pull ; ) || git clone $URL $DIR #clean up make distclean @@ -41,4 +41,3 @@ echo ' --' $rnam '<'$lnam'@'`hostname -f`'> ' `date --rfc-822` >>$CL #build echo "Calling debhelper to build..." fakeroot debian/rules binary -