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

Changeset - f23676d337db

Parent rev.

Child rev.

[Not reviewed]

default

0 1 7

Roeland Merks - 15 years ago 2010-06-10 11:38:00
roeland.merks@cwi.nl

Added deployment code for MacOSX to VirtualLeaf.pro
Added MacOSX script for PackageMaker

user: Roeland Merks <roeland.merks@cwi.nl>
branch 'default'
added src/vleafmacosx_installer.pmdoc/01virtualleaf-contents.xml
added src/vleafmacosx_installer.pmdoc/01virtualleaf.xml
added src/vleafmacosx_installer.pmdoc/02models-contents.xml
added src/vleafmacosx_installer.pmdoc/02models.xml
added src/vleafmacosx_installer.pmdoc/03leaves-contents.xml
added src/vleafmacosx_installer.pmdoc/03leaves.xml
added src/vleafmacosx_installer.pmdoc/index.xml
changed src/VirtualLeaf.pro

1 file changed:

src/VirtualLeaf.pro

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)

src/VirtualLeaf.pro

➞

Show inline comments

@@ @@ -67,35 +67,24 @@ win32 { @@
   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(rm -f parameter.cpp parameter.h)
  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
@@ @@ -104,25 +93,25 @@ unix { @@
 system(perl $$PERLDIR/make_parameter_source.pl $$PARTMPL)
 system(perl $$PERLDIR/make_pardialog_source.pl $$PARTMPL)
 #system(perl $$PERLDIR/make_xmlwritecode.pl -h $$REACTIONS)
 # Input
 HEADERS += \
  apoplastitem.h \
  canvas.h \
  cellbase.h \
  cell.h \
  cellitem.h \
-# forwardeuler.h \
  forwardeuler.h \
  infobar.h \
  mainbase.h \
  mainbase.h \
  matrix.h \
  mesh.h \
  miscq.h \
  modelcatalogue.h \
  Neighbor.h \
  node.h \
  nodeitem.h \
  nodeset.h \
  OptionFileDialog.h \
@@ @@ -137,35 +126,33 @@ HEADERS += \ @@
  simitembase.h \
  simplugin.h \
  sqr.h \
  tiny.h \
  transporterdialog.h \
  UniqueMessage.h \
  vector.h \
  wallbase.h \
  wall.h \
  wallitem.h \
  warning.h \
  xmlwrite.h \
  flux_function.h \
  vleafmodel.h \
  $${PARTMPL}
 SOURCES += \
  apoplastitem.cpp \
  canvas.cpp \
  cellbase.cpp \
  cell.cpp \
  cellitem.cpp \
-# forwardeuler.cpp \
  forwardeuler.cpp \
  mainbase.cpp \
  matrix.cpp \
  mesh.cpp \
  miscq.cpp \
  modelcatalogue.cpp \
  Neighbor.cpp \
  node.cpp \
  nodeitem.cpp \
  nodeset.cpp \
  OptionFileDialog.cpp \
  output.cpp \
  parameter.cpp \
@@ @@ -213,13 +200,41 @@ contains( GRAPHICS, x11 ) { @@
  !unix {
   error("X11 graphics only available on Unix systems.")
+ }
  message("Building X11 executable")
  SOURCES += x11graph.cpp
  HEADERS += x11graph.h
  QMAKE_CXXFLAGS += -DX11GRAPHICS
  CONFIG -= qt
  CONFIG += x11
  unix:LIBS += -lpng
+}
 #contains( GRAPHICS, qwt ) {
 # 	QMAKE_POST_LINK = "install_name_tool -change libqwt.5.dylib $$QWTDIR/lib/libqwt.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}; \
 #}
 # MACOSX packaging
 macx {
 ICON = leaficon.icns
 QMAKE_POST_LINK = "\
 	#install_name_tool -change libqwt.5.dylib $$QWTDIR/lib/libqwt.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}; \
 	cp leaficon.icns $${DESTDIR}/$${TARGET}.app; \
 	mkdir $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \
 	cp -R /Library/Frameworks/QtCore.framework $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \
 	cp -R /Library/Frameworks/QtGui.framework $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \
 	cp -R /Library/Frameworks/Qt3Support.framework $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \
 	#cp /usr/local/qwt/lib/libqwt.dylib $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \
 	#install_name_tool -id @executable_path/../Frameworks/libqwt.dylib $${DESTDIR}/$${TARGET}.app/Contents/Frameworks/libqwt.dylib; \
 	install_name_tool -change /usr/local/qwt/lib/libqwt.dylib @executable_path/../Frameworks/libqwt.dylib $${DESTDIR}/$${TARGET}.app/Contents/MacOS/$${TARGET};\
 	install_name_tool -id @executable_path/../Frameworks/QtCore.framework/Versions/Current/QtCore $${DESTDIR}/$${TARGET}.app/Contents/Frameworks/QtCore.framework/Versions/4.0/QtCore; \
 	install_name_tool -id @executable_path/../Frameworks/QtGui.framework/Versions/Current/QtGui $${DESTDIR}/$${TARGET}.app/Contents/Frameworks/QtGui.framework/Versions/4.0/QtGui; \
 	install_name_tool -id @executable_path/../Frameworks/Qt3Support.framework/Versions/Current/Qt3Support $${DESTDIR}/$${TARGET}.app/Contents/Frameworks/Qt3Support.framework/Versions/4.0/Qt3Support; \
 	install_name_tool -change Frameworks/QtCore.framework/Versions/Current/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/4.0/QtCore $${DESTDIR}/$${TARGET}.app/Contents/MacOS/$${TARGET}; \
 	install_name_tool -change Frameworks/QtGui.framework/Versions/Current/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/4.0/QtGui $${DESTDIR}/$${TARGET}.app/Contents/MacOS/$${TARGET}; \
 	install_name_tool -change Frameworks/Qt3Support.framework/Versions/Current/Qt3Support @executable_path/../Frameworks/Qt3Support.framework/Versions/4.0/Qt3Support $${DESTDIR}/$${TARGET}.app/Contents/MacOS/$${TARGET}; \
 	install_name_tool -change Frameworks/QtCore.framework/Versions/Current/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/4.0/QtCore $${DESTDIR}/$${TARGET}.app/Contents/Frameworks/Qt3Support.framework/Versions/4.0/Qt3Support; \
 	install_name_tool -change Frameworks/QtGui.framework/Versions/Current/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/4.0/QtGui $${DESTDIR}/$${TARGET}.app/Contents/Frameworks/Qt3Support.framework/Versions/4.0/Qt3Support; \
 	install_name_tool -change Frameworks/QtCore.framework/Versions/Current/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/4.0/QtCore $${DESTDIR}/$${TARGET}.app/Contents/Frameworks/Qt3Support.framework/Versions/4.0/Qt3Support; "
+}
 # finis

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)