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
5
src/Makefile
2
src/VirtualLeaf.pro
9
src/build_models/Makefile
4
src/libplugin.pro
10
0 comments (0 inline, 0 general)
src/ChangeLog
➞
Show inline comments
 
2010-06-07    <guravage@caterpie.sen.cwi.nl>
 

			




	
	
	
		
 
	* VirtualLeaf.pro: Removed explicit perl invocation to regerenerate parameter files.

			




	
	
	
		
 
	* libplugin.pro: ditto.

			




	
	
	
		
 

			




	
	
	
		
 
2010-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.

			




	
	
	
		
 

			




	
	
	
		
 
	* VirtualLeaf.pro: delete/generate  parameter.{h,cpp}and pardialog.{h,cpp} only if perl is installed.

			




	
	
	
		
 
 	* libplugin.pro: dito.

			




	
	
	
		
 

			




	
	
	
		
 
	* Makefile: Added top-level Makefile

			




	
	
	
		
 

			




	
	
	
		
 
2010-05-10    <guravage@caterpie.sen.cwi.nl>

			




	
	
	
		
 

			




	
	
	
		
 
	* VirtualLeaf.pro: Added -fPIC option to QMAKE_CXXFLAGS.

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/Makefile
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2,26 +2,28 @@

			




	
	
	
		
 

			




	
	
	
		
 
QMAKE = qmake

			




	
	
	
		
 

			




	
	
	
		
 
all: VirtualLeaf libplugin plugins

			




	
	
	
		
 

			




	
	
	
		
 
VirtualLeaf: Makefile.VirtualLeaf

			




	
	
	
		
 
	make -f Makefile.VirtualLeaf

			




	
	
	
		
 

			




	
	
	
		
 
Makefile.VirtualLeaf: VirtualLeaf.pro

			




	
	
	
		
 
	$(QMAKE) -makefile -o $@ $< 

			




	
	
	
		
 

			




	
	
	
		
 
libplugin: Makefile.libplugin

			




	
	
	
		
 
	make -f Makefile.libplugin

			




	
	
	
		
 

			




	
	
	
		
 
Makefile.libplugin: libplugin.pro

			




	
	
	
		
 
	$(QMAKE) -makefile -o $@ $< 

			




	
	
	
		
 

			




	
	
	
		
 
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
                    
                

        

        

            



	
	
		
 
@@ -29,100 +29,91 @@ QMAKE_CXXFLAGS_DEBUG += -DQDEBUG

			




	
	
	
		
 

			




	
	
	
		
 
#REACTIONS = reactions_auxin_growth.h 

			




	
	
	
		
 
#REACTIONS = reactions_meinhardt.h

			




	
	
	
		
 
#REACTIONS = reactions_pce_growth.h

			




	
	
	
		
 
DEFINES += QTGRAPHICS

			




	
	
	
		
 
DEFINES += REACTIONS_HEADER=$${REACTIONS}

			




	
	
	
		
 
DEFINES += REACTIONS_HEADER_STRING=\"$${REACTIONS}\"

			




	
	
	
		
 
DEFINES += FLEMING

			




	
	
	
		
 

			




	
	
	
		
 
PERLDIR = ./perl

			




	
	
	
		
 
BINDIR = ../bin

			




	
	
	
		
 
DESTDIR = $$BINDIR

			




	
	
	
		
 
TARGET = VirtualLeaf

			




	
	
	
		
 
TEMPLATE = app

			




	
	
	
		
 
PARTMPL = $${TARGET}par.tmpl

			




	
	
	
		
 
MAINSRC = $${TARGET}.cpp

			




	
	
	
		
 
QT -= network sql xml

			




	
	
	
		
 
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 

			




	
	
	
		
 
 RC_FILE = VirtualLeaf.rc

			




	
	
	
		
 
 QMAKE_CXXFLAGS += -DLIBXML_STATIC

			




	
	
	
		
 
 QMAKE_CXXFLAGS += -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\include -I$${LIBZDIR}\include

			




	
	
	
		
 
 QMAKE_POST_LINK = "\

			




	
	
	
		
 
  C:\Bin\cp release\VirtualLeaf.exe \

			




	
	
	
		
 
  C:\Qt\4.5.3\bin\Qt3Support4.dll \

			




	
	
	
		
 
  C:\Qt\4.5.3\bin\QtGui4.dll \

			




	
	
	
		
 
  C:\Qt\4.5.3\bin\QtSql4.dll \

			




	
	
	
		
 
  C:\Qt\4.5.3\bin\QtXml4.dll \

			




	
	
	
		
 
  C:\Qt\4.5.3\bin\QtCore4.dll \

			




	
	
	
		
 
  C:\Qt\4.5.3\bin\QtNetwork4.dll \

			




	
	
	
		
 
  C:\Qt\4.5.3\bin\QtSvg4.dll \

			




	
	
	
		
 
  C:\bin\iconv.dll \

			




	
	
	
		
 
  C:\bin\libxml2.dll \

			




	
	
	
		
 
  C:\bin\zlib1.dll \

			




	
	
	
		
 
  C:\MinGW\bin\mingwm10.dll \

			




	
	
	
		
 
  $${DESTDIR}"

			




	
	
	
		
 
 LIBS += -L$${LIBXML2DIR}\lib -lxml2 -L$${LIBICONVDIR}\lib -L$${LIBZDIR}\lib  -lz -lm -lwsock32 -liconv

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
# Application icons

			




	
	
	
		
 
macx {

			




	
	
	
		
 
 ICON = leaficon.icns

			




	
	
	
		
 
 # make sure that the executable can find the libqwt share library

			




	
	
	
		
 
 QMAKE_POST_LINK = "mkdir $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \

			




	
	
	
		
 
  cp /usr/local/qwt/lib/libqwt.dylib $${DESTDIR}/$${TARGET}.app/Contents/Frameworks/.; \

			




	
	
	
		
 
  #install_name_tool -change libqwt.5.dylib $$QWTDIR/lib/libqwt.dylib $${DESTDIR}/$${TARGET}.app/Contents/MacOS/$${TARGET}; \

			




	
	
	
		
 
  install_name_tool -id @executable_path/../Frameworks/libqwt.dylib $${DESTDIR}/$${TARGET}.app/Contents/Frameworks/libqwt.dylib; \

			




	
	
	
		
 
  install_name_tool -change libqwt.5.dylib @executable_path/../Frameworks/libqwt.dylib $${DESTDIR}/$${TARGET}.app/Contents/MacOS/$${TARGET};\

			




	
	
	
		
 
  cp leaficon.icns $${DESTDIR}/$${TARGET}.app; "

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
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 

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
# Input

			




	
	
	
		
 
HEADERS += \

			




	
	
	
		
 
 apoplastitem.h \

			




	
	
	
		
 
 canvas.h \

			




	
	
	
		
 
 cellbase.h \

			




	
	
	
		
 
 cell.h \

			




	
	
	
		
 
 cellitem.h \

			




	
	
	
		
 
# forwardeuler.h \

			




	
	
	
		
 
 infobar.h \

			




	
	
	
		
 
 mainbase.h \

			




	
	
	
		
 
 mainbase.h \

			




	
	
	
		
 
 matrix.h \

			




	
	
	
		
 
 mesh.h \

			




	
	
	
		
 
 miscq.h \

			




	
	
	
		
 
 modelcatalogue.h \

			




	
	
	
		
 
 Neighbor.h \

			




        

    


    
    

    

        

                

                    src/build_models/Makefile
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -12,26 +12,30 @@ Makefile.plugin_auxingrowth: plugin_auxi

			




	
	
	
		
 

			




	
	
	
		
 
plugin_leaf: Makefile.plugin_leaf

			




	
	
	
		
 
	make -f Makefile.plugin_leaf

			




	
	
	
		
 

			




	
	
	
		
 
Makefile.plugin_leaf: plugin_leaf.pro

			




	
	
	
		
 
	$(QMAKE) -makefile -o $@ $< 

			




	
	
	
		
 

			




	
	
	
		
 
plugin_meinhardt: Makefile.plugin_meinhardt

			




	
	
	
		
 
	make -f Makefile.plugin_meinhardt

			




	
	
	
		
 

			




	
	
	
		
 
Makefile.plugin_meinhardt: plugin_meinhardt.pro

			




	
	
	
		
 
	$(QMAKE) -makefile -o $@ $< 

			




	
	
	
		
 

			




	
	
	
		
 
plugin_test: Makefile.plugin_test

			




	
	
	
		
 
	make -f Makefile.plugin_test

			




	
	
	
		
 

			




	
	
	
		
 
Makefile.plugin_test: plugin_test.pro

			




	
	
	
		
 
	$(QMAKE) -makefile -o $@ $< 

			




	
	
	
		
 

			




	
	
	
		
 
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
                    
                

        

        

            



	
	
		
 
@@ -42,48 +42,38 @@ HEADERS = \

			




	
	
	
		
 
 output.h \

			




	
	
	
		
 
 parameter.h \

			




	
	
	
		
 
 parse.h \

			




	
	
	
		
 
 random.h \

			




	
	
	
		
 
 simplugin.h \

			




	
	
	
		
 
 UniqueMessage.h \

			




	
	
	
		
 
 vector.h \

			




	
	
	
		
 
 wallbase.h \

			




	
	
	
		
 
 warning.h

			




	
	
	
		
 

			




	
	
	
		
 
SOURCES = \

			




	
	
	
		
 
 cellbase.cpp \

			




	
	
	
		
 
 matrix.cpp \

			




	
	
	
		
 
 output.cpp \

			




	
	
	
		
 
 parameter.cpp \

			




	
	
	
		
 
 parse.cpp \

			




	
	
	
		
 
 random.cpp \

			




	
	
	
		
 
 simplugin.cpp \

			




	
	
	
		
 
 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)
    





    


  

  







  


    




    








    
        Server instance: kalli-2462074
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2022 by various authors & licensed under GPLv3.
            – Support