EI/VirtualLeaf Changeset - 8b6e1d8e0734 · Centrum Wiskunde & Informatica (CWI)

Changeset - 8b6e1d8e0734

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Michael Guravage - 15 years ago 2010-06-14 10:49:21
michael.guravage@cwi.nl

Removed from VirtualLeaf and libplugin project files their explicit perl invocation to regerenerate parameter files.

--
user: Michael Guravage <michael.guravage@cwi.nl>
branch 'default'

changed src/ChangeLog
changed src/Makefile
changed src/VirtualLeaf.pro
changed src/build_models/Makefile
changed src/libplugin.pro

5 files changed with 11 insertions and 19 deletions:

src/ChangeLog

src/Makefile

src/VirtualLeaf.pro

src/build_models/Makefile

src/libplugin.pro

0 comments (0 inline, 0 general)

src/ChangeLog

➞

Show inline comments

 -06-07    <guravage@caterpie.sen.cwi.nl>
 	* VirtualLeaf.pro: Removed explicit perl invocation to regerenerate parameter files.
 	* libplugin.pro: ditto.
 -06-03    <guravage@caterpie.sen.cwi.nl>
 	* pardialog.h: Added default versions of this automatically generated file.
 	* pardialog.cpp: ditto.
 	* parameter.h: ditto.
 	* parameter.cpp: ditto.

src/Makefile

➞

Show inline comments

@@ @@ -20,8 +20,10 @@ plugins: @@
 	make -C build_models
 clean:
 	make -f Makefile.libplugin clean
 	make -f Makefile.VirtualLeaf clean
 	make -C build_models clean
 	touch VirtualLeaf.pro
 	touch libplugin.pro
 #finis

src/VirtualLeaf.pro

➞

Show inline comments

@@ @@ -47,17 +47,12 @@ QT += qt3support @@
 !win32 {
  GRAPHICS = qt #qwt
+}
 win32 {
  system(WHERE /Q perl && IF errorlevel 0 (DEL parameter.cpp parameter.h pardialog.cpp pardialog.h)
  system(WHERE /Q perl && IF errorlevel 0 (perl $$PERLDIR\make_parameter_source.pl $$PARTMPL)
  system(WHERE /Q perl && IF errorlevel 0 (perl $$PERLDIR\make_pardialog_source.pl $$PARTMPL)
 #system(WHERE /Q perl && IF errorlevel 0 (perl $$PERLDIR\make_xmlwritecode.pl -h $$REACTIONS)
  CONFIG += console
  LIBXML2DIR = C:\libxml2
  LIBICONVDIR = C:\libiconv
  LIBZDIR = C:\libz
  system(DEL parameter.cpp parameter.h)
  GRAPHICS = qt
@@ @@ -95,16 +90,12 @@ macx { @@
 macx:release {
  LIBS+= -dead_strip
+}
 unix {
  system(if `which perl > /dev/null 2>&1` ; then rm -f parameter.cpp parameter.h pardialog.cpp pardialog.h; fi)
  system(if `which perl > /dev/null 2>&1` ; then perl $$PERLDIR/make_parameter_source.pl $$PARTMPL; fi)
  system(if `which perl > /dev/null 2>&1` ; then perl $$PERLDIR/make_pardialog_source.pl $$PARTMPL; fi)
 #system(if `which perl > /dev/null 2>&1` ; then perl $$PERLDIR/make_xmlwritecode.pl -h $$REACTIONS; fi)
  CC = /usr/bin/gcc
  QWTDIR = /ufs/guravage/opt/qwt-5.2.1-svn
  QMAKE_LIBDIR += $$QWTDIR/lib
  QMAKE_CXXFLAGS += -fPIC -I/usr/include/libxml2
  QMAKE_LFLAGS += -fPIC
  LIBS += -lxml2 -lz -lm

src/build_models/Makefile

➞

Show inline comments

@@ @@ -30,8 +30,12 @@ Makefile.plugin_test: plugin_test.pro @@
 clean:
 	make -f Makefile.plugin_auxingrowth clean
 	make -f Makefile.plugin_leaf clean
 	make -f Makefile.plugin_meinhardt clean
 	make -f Makefile.plugin_test clean
 	touch plugin_auxingrowth.pro
 	touch plugin_leaf.pro
 	touch plugin_meinhardt.pro
 	touch plugin_test.pro
 #finis

src/libplugin.pro

➞

Show inline comments

@@ @@ -60,28 +60,18 @@ SOURCES = \ @@
  UniqueMessage.cpp \
  vector.cpp \
  wallbase.cpp \
  warning.cpp
 unix {
  system(if `which perl > /dev/null 2>&1` ; then rm -f parameter.cpp parameter.h pardialog.cpp pardialog.h; fi)
  system(if `which perl > /dev/null 2>&1` ; then perl $$PERLDIR/make_parameter_source.pl $$PARTMPL; fi)
  system(if `which perl > /dev/null 2>&1` ; then perl $$PERLDIR/make_pardialog_source.pl $$PARTMPL; fi)
 #system(if `which perl > /dev/null 2>&1` ; then perl $$PERLDIR/make_xmlwritecode.pl -h $$REACTIONS; fi)
  QMAKE_CXXFLAGS += -fPIC -I/usr/include/libxml2
  QMAKE_LFLAGS += -fPIC
  LIBS += -lxml2 -lz -lm
+}
 win32 {
  system(WHERE /Q perl && IF errorlevel 0 (DEL parameter.cpp parameter.h pardialog.cpp pardialog.h)
  system(WHERE /Q perl && IF errorlevel 0 (perl $$PERLDIR\make_parameter_source.pl $$PARTMPL)
  system(WHERE /Q perl && IF errorlevel 0 (perl $$PERLDIR\make_pardialog_source.pl $$PARTMPL)
 #system(WHERE /Q perl && IF errorlevel 0 (perl $$PERLDIR\make_xmlwritecode.pl -h $$REACTIONS)
  LIBXML2DIR = C:\libxml2
  LIBICONVDIR = C:\libiconv
  LIBZDIR = C:\libz
  QMAKE_CXXFLAGS += -DLIBXML_STATIC
  QMAKE_CXXFLAGS += -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\include -I$${LIBZDIR}\include
+}

0 comments (0 inline, 0 general)