[openmeca] 01/01: Do not commit quilt patched version - removed .pc dir and patch for Makefile
Andreas Tille
tille at debian.org
Sat Jan 28 19:42:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository openmeca.
commit f5f289c9a0b1653e3eebadd35a81962a2ab9316a
Author: Andreas Tille <tille at debian.org>
Date: Sat Jan 28 20:42:03 2017 +0100
Do not commit quilt patched version - removed .pc dir and patch for Makefile
---
.pc/.quilt_patches | 1 -
.pc/.quilt_series | 1 -
.pc/.version | 1 -
.pc/applied-patches | 1 -
.pc/make-patch/Makefile | 206 ------------------------------------------------
Makefile | 9 +--
6 files changed, 4 insertions(+), 215 deletions(-)
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
deleted file mode 100644
index 6857a8d..0000000
--- a/.pc/.quilt_patches
+++ /dev/null
@@ -1 +0,0 @@
-debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
deleted file mode 100644
index c206706..0000000
--- a/.pc/.quilt_series
+++ /dev/null
@@ -1 +0,0 @@
-series
diff --git a/.pc/.version b/.pc/.version
deleted file mode 100644
index 0cfbf08..0000000
--- a/.pc/.version
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/.pc/applied-patches b/.pc/applied-patches
deleted file mode 100644
index 6b04c9d..0000000
--- a/.pc/applied-patches
+++ /dev/null
@@ -1 +0,0 @@
-make-patch
diff --git a/.pc/make-patch/Makefile b/.pc/make-patch/Makefile
deleted file mode 100644
index e17fa92..0000000
--- a/.pc/make-patch/Makefile
+++ /dev/null
@@ -1,206 +0,0 @@
-
-# The install path used when run a 'make install'
-ifndef DESTDIR
- DESTDIR=/usr/local
-endif
-
-# the bin dir
-BINDIR=bin
-
-# The qmake utility location (for unix-like systems)
-QMAKE=qmake
-
-
-
-####################################
-# Cross compile from unix to win32 #
-####################################
-# The mxe platform is used. So, you need to specifiy your mxe path.
-# For example, if you type 'mxe=/home/omc/mxe make',
-# it runs a cross-compilation
-
-# if mxe is used, the mxe path must be exported
-ifdef mxe
- export PATH := $(mxe)/usr/bin:$(PATH)
- mxe_bin = $(mxe)/usr/i686-w64-mingw32.static/qt5/bin
-endif
-
-####################################
-# Compile on OS X #
-####################################
-OSName := $(shell uname)
-
-####################################
-# Makefile targets #
-####################################
-.PHONY: all message boost qglviewer qwt chronoengine openmeca
-
-all: message
- $(MAKE) boost
- $(MAKE) qglviewer
- $(MAKE) qwt
- $(MAKE) chronoengine
- $(MAKE) openmeca
-
-message:
-ifdef mxe
- @echo 'cross compiling for win32...' ;\
- sleep 1
-endif
- @echo 'compiling...'
-
-clean:
- -rm -rf SRC/Boost/BUILD
- -rm -rf SRC/Boost/b2
- -rm -rf SRC/Boost/bin.v2
- -rm -rf SRC/Boost/bjam
- -rm -rf SRC/Boost/bootstrap.log
- -rm -rf SRC/Boost/project-config.jam*
- -rm -rf SRC/Boost/tools/build/v2/engine/bin.*
- -rm -rf SRC/Boost/tools/build/v2/engine/bootstrap/
- -rm -rf SRC/QGLViewer/BUILD
- -rm -rf SRC/QGLViewer/.qmake.stash
- -rm -rf SRC/QGLViewer/Makefile
- -rm -rf SRC/QGLViewer/Makefile.Debug
- -rm -rf SRC/QGLViewer/Makefile.Release
- -rm -rf SRC/QGLViewer/QGLViewer.prl
- -rm -rf SRC/QGLViewer/QGLViewerd.prl
- -rm -rf SRC/QGLViewer/object_script.*
- -rm -rf SRC/ChronoEngine/BUILD
- -rm -rf SRC/QGLViewer/.qmake.stash
- -rm -rf SRC/ChronoEngine/Makefile.Debug
- -rm -rf SRC/ChronoEngine/Makefile.Release
- -rm -rf SRC/ChronoEngine/object_script.*
- -rm -rf SRC/Qwt/BUILD
- -rm -rf SRC/QGLViewer/.qmake.stash
- -rm -rf SRC/Qwt/Makefile
- -rm -rf SRC/OpenMeca/BUILD
- -rm -rf SRC/QGLViewer/.qmake.stash
- -rm -rf SRC/OpenMeca/Makefile.Debug
- -rm -rf SRC/OpenMeca/Makefile.Release
- -rm -rf SRC/OpenMeca/object_script.*
- -rm -rf SRC/OpenMeca/Rsc/Help/Help.qch
- -rm -rf SRC/OpenMeca/Rsc/Help/Help.qhc
- -rm -rf SRC/OpenMeca/Rsc/Lang/openmeca_fr.qm
-
-
-install: all
- @echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
- echo '@@ Installing openmeca @@'; \
- echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
- mkdir -p $(DESTDIR)/$(BINDIR)
- cp -ar ./SRC/OpenMeca/BUILD/openmeca $(DESTDIR)/$(BINDIR)
- @echo 'The openmeca executable was installed in the $(DESTDIR)/$(BINDIR) directory'
-
-
-uninstall:
- @echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
- echo '@@ Uninstalling openmeca @@'; \
- echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
- rm $(DESTDIR)/$(BINDIR)/openmeca
- @echo 'The openmeca executable was removed from $(DESTDIR)/$(BINDIR)'
-
-
-purge: uninstall
- rm -rf $(HOME)/openmeca
- @echo 'The openmeca config directory $(HOME)/openmeca was removed'
-
-
-boost:
- @echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
- echo '@@ making the boost third party library @@'; \
- echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
- sleep 1
-ifdef mxe
- @echo 'cross boost compiling for win32 !'
- @cd SRC/Boost ; \
- echo 'using gcc : mxe : i686-w64-mingw32.static-g++ : <rc>i686-w64-mingw32.static-windres <archiver>i686-w64-mingw32.static-ar <ranlib>i686-w64-mingw32.static-ranlib ;' > 'user-config.jam';\
- ./bootstrap.sh ;\
- ./b2 --ignore-site-config --user-config=user-config.jam link=static target-os=windows variant=release toolset=gcc-mxe --with-serialization --prefix=./BUILD/ install
-else
- @cd SRC/Boost ; \
- ./bootstrap.sh && ./b2 link=static runtime-link=static --with-serialization --prefix=./BUILD/ install
-endif
- - at cd SRC/Boost/; ./edit-header-for-openmeca.sh
-
-
-qglviewer:
- @echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
- echo '@@ making the qglviewer third party library @@'; \
- echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
- sleep 1
-ifdef mxe
- @echo 'cross compiling qglviewer for win32 !'
- @cd SRC/QGLViewer ;\
- $(mxe_bin)/qmake PREFIX=../BUILD;\
- $(MAKE) install;
-else
- @cd SRC/QGLViewer ; \
- $(QMAKE) ; \
- $(MAKE) install
-endif
-
-
-
-qwt:
- @echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
- echo '@@ making the qwt third party library @@'; \
- echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
- sleep 1
-ifdef mxe
- @echo 'cross compiling qwt for win32 !'
- @cd SRC/Qwt ;\
- $(mxe_bin)/qmake ;\
- $(MAKE) install
-else
- @cd SRC/Qwt ; \
- $(QMAKE) ; \
- $(MAKE) install
-endif
-
-
-
-chronoengine:
- @echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
- echo '@@ making the chronoengine third party library @@'; \
- echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
- sleep 1
-ifdef mxe
- @echo 'cross compiling chronoengine for win32 !'
- @cd SRC/ChronoEngine ;\
- $(mxe_bin)/qmake ;\
- $(MAKE) install
-else
- @cd SRC/ChronoEngine ; \
- $(QMAKE) ; \
- $(MAKE) install
-endif
-
-
-
-openmeca:
- @echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
- echo '@@ making openmeca @@'; \
- echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
- sleep 1
-ifdef mxe
- @echo 'cross compiling openmeca for win32 !'
- @cd SRC/OpenMeca ; \
- lrelease ./OpenMeca.pro ; \
- qhelpgenerator ./Rsc/Help/Help.qhp -o ./Rsc/Help/Help.qch ; \
- qcollectiongenerator ./Rsc/Help/Help.qhcp -o ./Rsc/Help/Help.qhc ;\
- $(mxe_bin)/qmake ;\
- $(MAKE)
-else
- @cd SRC/OpenMeca ; \
- lrelease ./OpenMeca.pro ; \
- qhelpgenerator ./Rsc/Help/Help.qhp -o ./Rsc/Help/Help.qch ; \
- qcollectiongenerator ./Rsc/Help/Help.qhcp -o ./Rsc/Help/Help.qhc ;\
- $(QMAKE) ; \
- $(MAKE)
-ifeq ($(OSName),Darwin)
- macdeployqt SRC/OpenMeca/BUILD/openmeca.app
-endif
-endif
- @echo 'The executable was built in the OpenMeca/BUILD/openmeca directory';
-
diff --git a/Makefile b/Makefile
index 89c81cc..e17fa92 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,7 @@ endif
BINDIR=bin
# The qmake utility location (for unix-like systems)
-QMAKE=qtchooser -qt=5 -run-tool=qmake
-
+QMAKE=qmake
@@ -194,9 +193,9 @@ ifdef mxe
$(MAKE)
else
@cd SRC/OpenMeca ; \
- qtchooser -qt=5 -run-tool=lrelease ./OpenMeca.pro ; \
- qtchooser -qt=5 -run-tool=qhelpgenerator ./Rsc/Help/Help.qhp -o ./Rsc/Help/Help.qch ; \
- qtchooser -qt=5 -run-tool=qcollectiongenerator ./Rsc/Help/Help.qhcp -o ./Rsc/Help/Help.qhc ;\
+ lrelease ./OpenMeca.pro ; \
+ qhelpgenerator ./Rsc/Help/Help.qhp -o ./Rsc/Help/Help.qch ; \
+ qcollectiongenerator ./Rsc/Help/Help.qhcp -o ./Rsc/Help/Help.qhc ;\
$(QMAKE) ; \
$(MAKE)
ifeq ($(OSName),Darwin)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openmeca.git
More information about the debian-science-commits
mailing list