Added modifications for Qutemolx build and added a build script with needed files.

author: Derrick Hendricks <derrick@nanorex.com> 2008-07-24 16:03:05 +0000
committer: Derrick Hendricks <derrick@nanorex.com> 2008-07-24 16:03:05 +0000
commit: 55d5fd6a550d62fbfb43c25c9f12bac0e71be41d (patch)
tree: b28365370e2e08b263a417435d8fce3aba813e21
parent: 50b8c011d474e30a4e76c57ccd1ce7470add70a1 (diff)
download: nanoengineer-theirix-55d5fd6a550d62fbfb43c25c9f12bac0e71be41d.tar.gz
nanoengineer-theirix-55d5fd6a550d62fbfb43c25c9f12bac0e71be41d.zip
6 files changed, 204 insertions, 12 deletions
diff --git a/cad/plugins/QuteMol/packaging/ReadMe.html b/cad/plugins/QuteMol/packaging/ReadMe.html
index 676489444..610950d1a 100644
--- a/cad/plugins/QuteMol/packaging/ReadMe.html
+++ b/cad/plugins/QuteMol/packaging/ReadMe.html
@@ -2,16 +2,16 @@
 <!-- Copyright 2008 Nanorex, Inc.  See LICENSE file for details. -->
 <head>
 <title>
-QuteMolX 0.5.0
+QuteMolX 0.5.1
 </title>
 </head>
 
 <body>
 
-<h1>QuteMolX 0.5.0</h1>
+<h1>QuteMolX 0.5.1</h1>
 QuteMolX is an interactive, high quality molecular visualization application forked off of the original code (<a href="http://qutemol.sourceforge.net/">QuteMol</a>) written by Marco Tarini and Paolo Cignoni of the Visual Computing Lab at the Institute of Information Science and Technologies (ISTI), an institute of the Italian National Research Council (CNR). QuteMolX exploits current GPU capabilites through OpenGL shaders to offer an array of innovative visual effects. QuteMolX visualization techniques are aimed at improving clarity and understanding of the 3D shape and structure of large complex molecules.
 <p>
-This is QuteMolX 0.5.0 as of April 25, 2008.
+This is QuteMolX 0.5.1 as of April 25, 2008.
 <p>
 Click the following links or visit the official <a href="http://www.nanoengineer-1.com/QuteMolX/">QuteMolX</a> page to learn more about QuteMolX:
 <ul>
@@ -24,7 +24,7 @@ Click the following links or visit the official <a href="http://www.nanoengineer
 <h2>System Requirements</h2>
 <ul>
   <li>2.5 GHz Intel Pentium 4 CPU or equivalent
-  <li>Windows XP, Mac OS X 10.3.9
+  <li>Windows XP, Mac OS X 10.5.2
   <li>1 Gb RAM
   <li>10 Mb available disk space
   <li>OpenGL compatible 3D video card with FBO and VBO support (<a href="http://www.delphi3d.net/hardware/extsupport.php?extension=GL_EXT_framebuffer_object">this web page</a> gives a good list of recommended video cards.)
@@ -37,20 +37,20 @@ Click the following links or visit the official <a href="http://www.nanoengineer
 <h2>Installation Instructions</h2>
 
 <h3>Windows</h3>
-Run the QuteMolX self-extracting installer "QuteMolX_0.5.0.exe". 
+Run the QuteMolX self-extracting installer "QuteMolX_0.5.1.exe". 
 
 <h3>Mac OS X</h3>
-Run the QuteMolX self-extracting installer "QuteMolX_0.5.0.dmg".
+Run the QuteMolX self-extracting installer "QuteMolX_0.5.1.dmg".
 
 <h3>Linux and Developers</h3>
-QuteMolX must be compiled from sources for Linux users and developers. Download the QuteMolX source distribution "QuteMolX_0.5.0.tar.gz" and follow the instructions here: <a href="http://www.nanoengineer-1.net/mediawiki/index.php?title=Building_and_Installing_QuteMolX">Building and Installing QuteMolX</a>
+QuteMolX must be compiled from sources for Linux users and developers. Download the QuteMolX source distribution "QuteMolX_0.5.1.tar.gz" and follow the instructions here: <a href="http://www.nanoengineer-1.net/mediawiki/index.php?title=Building_and_Installing_QuteMolX">Building and Installing QuteMolX</a>
 
 <h3>Post-install Notes</h3>
 If you have not installed this from the NanoEngineer-1 Suite installer you will have to modify your preferences to enable NanoEngineer-1 to use this plugin.
 <ol>
   <li> Launch NanoEngineer-1
   <li> Choose Tools -> Preferences -> Plug-ins
-  <li> Check the box for QuteMolX and input the full path to the QuteMolX executable including its file name. For example, on Windows it may be C:\Program Files\Nanorex\QuteMolX 0.5.0\QuteMolX.exe)
+  <li> Check the box for QuteMolX and input the full path to the QuteMolX executable including its file name. For example, on Windows it may be C:\Program Files\Nanorex\QuteMolX 0.5.1\QuteMolX.exe)
   <li> Click Ok.
 </ol>
 
diff --git a/cad/plugins/QuteMol/packaging/Win32/Makefile b/cad/plugins/QuteMol/packaging/Win32/Makefile
new file mode 100644
index 000000000..f368c4304
--- /dev/null
+++ b/cad/plugins/QuteMol/packaging/Win32/Makefile
@@ -0,0 +1,91 @@
+# Project: qutemolx
+# Compiler: Default GCC compiler
+# Compiler Type: MingW 3
+# Makefile created by wxDev-C++ 6.10.2 on 08/05/08 14:40
+
+CPP       = g++.exe
+CC        = gcc.exe
+WINDRES   = windres.exe
+OBJ       = Default\ Profile/wx_trackball.o Default\ Profile/AOgpu.o Default\ Profile/AtomColor.o Default\ Profile/CgUtil.o Default\ Profile/Common.o Default\ Profile/gifSave.o Default\ Profile/HardSettings.o Default\ Profile/main.o Default\ Profile/Mol.o Default\ Profile/MyCanvas.o Default\ Profile/MyTab.o Default\ Profile/pngSave.o Default\ Profile/Sampling.o Default\ Profile/ShadowMap.o Default\ Profile/saveSnapDialog.o Default\ Profile/progress.o Default\ Profile/glew.o Default\ Profile/trackball.o Default\ Profile/trackmode.o Default\ Profile/qutemol_private.res
+LINKOBJ   = "Default Profile/wx_trackball.o" "Default Profile/AOgpu.o" "Default Profile/AtomColor.o" "Default Profile/CgUtil.o" "Default Profile/Common.o" "Default Profile/gifSave.o" "Default Profile/HardSettings.o" "Default Profile/main.o" "Default Profile/Mol.o" "Default Profile/MyCanvas.o" "Default Profile/MyTab.o" "Default Profile/pngSave.o" "Default Profile/Sampling.o" "Default Profile/ShadowMap.o" "Default Profile/saveSnapDialog.o" "Default Profile/progress.o" "Default Profile/glew.o" "Default Profile/trackball.o" "Default Profile/trackmode.o" "Default Profile/qutemol_private.res"
+LIBS      = -L"C:/Program Files/Dev-Cpp/Lib" -L"C:/msys/1.0/local/lib"  -mwindows  -lwxmsw28  -lwxjpeg -lwxmsw28_gl  -lrpcrt4  -loleaut32  -lole32  -luuid  -lwinspool  -lwinmm  -lshell32  -lcomctl32  -lcomdlg32  -lctl3d32  -ladvapi32  -lwsock32  -lgdi32 -lopengl32 -lglu32 -lgif -lz -lpng  
+INCS      = -I"include" -I"C:/trunks/release_candidate-2008_04_14-1000/cad/plugins/QuteMol/glew/include" -I"../../vcg" -I"C:/msys/1.0/local/include" -I"../../glew/include"
+CXXINCS   = -I"C:/MinGW/lib/gcc/mingw32/3.4.2/include" -I"C:/MinGW/include/c++/3.4.2/backward" -I"C:/MinGW/include/c++/3.4.2/mingw32" -I"C:/MinGW/include/c++/3.4.2" -I"C:/MinGW/include" -I"C:/MinGW/" -I"C:/Program Files/Dev-Cpp//include/common/wx/msw" -I"C:/Program Files/Dev-Cpp/include/common/wx/generic" -I"C:/Program Files/Dev-Cpp/include/common/wx/fl" -I"C:/Program Files/Dev-Cpp/include/common/wx/gizmos" -I"C:/Program Files/Dev-Cpp/include/common/wx/html" -I"C:/Program Files/Dev-Cpp/include/common/wx/mmedia" -I"C:/Program Files/Dev-Cpp/include/common/wx/net" -I"C:/Program Files/Dev-Cpp/include/common/wx/ogl" -I"C:/Program Files/Dev-Cpp/include/common/wx/plot" -I"C:/Program Files/Dev-Cpp/include/common/wx/protocol" -I"C:/Program Files/Dev-Cpp/include/common/wx/stc" -I"C:/Program Files/Dev-Cpp/include/common/wx/svg" -I"C:/Program Files/Dev-Cpp/include/common/wx/xml" -I"C:/Program Files/Dev-Cpp/include/common/wx/xrc" -I"C:/Program Files/Dev-Cpp/include/common/wx" -I"C:/Program Files/Dev-Cpp/include/common" -I"../../vcg" -I"C:/msys/1.0/local/include" -I"../../glew/include"
+RCINCS    = --include-dir "C:/PROGRA~1/Dev-Cpp/include/common"
+BIN       = Default\ Profile/QuteMolX.exe
+DEFINES   = 
+CXXFLAGS  = $(CXXINCS) $(DEFINES) -D__WXMSW__  -DNO_GCC_PRAGMA  -fno-rtti  -fno-exceptions -DNO_DEBUG -DNDEBUG -DGLEW_STATIC   -fno-access-control -fexpensive-optimizations -O3
+CFLAGS    = $(INCS) $(DEFINES) -mthreads -D__WXMSW__  -DNO_GCC_PRAGMA  -fno-rtti  -fno-exceptions -DNO_DEBUG -DNDEBUG -DGLEW_STATIC   -fno-access-control -fexpensive-optimizations -O3
+GPROF     = gprof.exe
+RM        = rm -f
+LINK      = g++.exe
+
+.PHONY: all all-before all-after clean clean-custom
+all: all-before $(BIN) all-after
+
+clean: clean-custom
+	$(RM) $(OBJ) $(BIN)
+
+$(BIN): $(OBJ)
+	$(LINK) $(LINKOBJ) -o "Default Profile\QuteMolX.exe" $(LIBS)
+
+Default\ Profile/wx_trackball.o: $(GLOBALDEPS) wx_trackball.cpp
+	$(CPP) -c wx_trackball.cpp -o "Default Profile/wx_trackball.o" $(CXXFLAGS)
+
+Default\ Profile/AOgpu.o: $(GLOBALDEPS) AOgpu.cpp CgUtil.h CubeMapSamp.h OctaMapSamp.h Mol.h AOgpu.h HardSettings.h
+	$(CPP) -c AOgpu.cpp -o "Default Profile/AOgpu.o" $(CXXFLAGS)
+
+Default\ Profile/AtomColor.o: $(GLOBALDEPS) AtomColor.cpp AtomColor.h
+	$(CPP) -c AtomColor.cpp -o "Default Profile/AtomColor.o" $(CXXFLAGS)
+
+Default\ Profile/CgUtil.o: $(GLOBALDEPS) CgUtil.cpp CgUtil.h HardSettings.h MyCanvas.h
+	$(CPP) -c CgUtil.cpp -o "Default Profile/CgUtil.o" $(CXXFLAGS)
+
+Default\ Profile/Common.o: $(GLOBALDEPS) Common.cpp CgUtil.h gen_normal.h CubeMapSamp.h OctaMapSamp.h Mol.h Common.h HardSettings.h MyCanvas.h ShadowMap.h
+	$(CPP) -c Common.cpp -o "Default Profile/Common.o" $(CXXFLAGS)
+
+Default\ Profile/gifSave.o: $(GLOBALDEPS) gifSave.cpp gifSave.h
+	$(CPP) -c gifSave.cpp -o "Default Profile/gifSave.o" $(CXXFLAGS)
+
+Default\ Profile/HardSettings.o: $(GLOBALDEPS) HardSettings.cpp HardSettings.h
+	$(CPP) -c HardSettings.cpp -o "Default Profile/HardSettings.o" $(CXXFLAGS)
+
+Default\ Profile/main.o: $(GLOBALDEPS) main.cpp main.h image/gear2.xpm image/qutemolsm.xpm image/quiton.xpm image/quitoff.xpm image/snap_off2.xpm image/snap_on.xpm image/open_off2.xpm image/open_on.xpm image/snap_noborder.xpm image/open_noborder.xpm CgUtil.h gen_normal.h CubeMapSamp.h OctaMapSamp.h Mol.h MyCanvas.h ShadowMap.h HardSettings.h Common.h MyTab.h saveSnapDialog.h progress.h AtomColor.h gifSave.h
+	$(CPP) -c main.cpp -o "Default Profile/main.o" $(CXXFLAGS)
+
+Default\ Profile/Mol.o: $(GLOBALDEPS) Mol.cpp CubeMapSamp.h OctaMapSamp.h Mol.h HardSettings.h Progress.h AtomColor.h MyCanvas.h MyTab.h CgUtil.h Common.h
+	$(CPP) -c Mol.cpp -o "Default Profile/Mol.o" $(CXXFLAGS)
+
+Default\ Profile/MyCanvas.o: $(GLOBALDEPS) MyCanvas.cpp MyCanvas.h HardSettings.h
+	$(CPP) -c MyCanvas.cpp -o "Default Profile/MyCanvas.o" $(CXXFLAGS)
+
+Default\ Profile/MyTab.o: $(GLOBALDEPS) MyTab.cpp MyTab.h CgUtil.h Common.h image/logo.xpm image/geo1.xpm image/geo2.xpm image/geo3.xpm
+	$(CPP) -c MyTab.cpp -o "Default Profile/MyTab.o" $(CXXFLAGS)
+
+Default\ Profile/pngSave.o: $(GLOBALDEPS) pngSave.cpp progress.h
+	$(CPP) -c pngSave.cpp -o "Default Profile/pngSave.o" $(CXXFLAGS)
+
+Default\ Profile/Sampling.o: $(GLOBALDEPS) Sampling.cpp CgUtil.h CubeMapSamp.h OctaMapSamp.h
+	$(CPP) -c Sampling.cpp -o "Default Profile/Sampling.o" $(CXXFLAGS)
+
+Default\ Profile/ShadowMap.o: $(GLOBALDEPS) ShadowMap.cpp CgUtil.h CubeMapSamp.h OctaMapSamp.h Mol.h HardSettings.h MyCanvas.h ShadowMap.h
+	$(CPP) -c ShadowMap.cpp -o "Default Profile/ShadowMap.o" $(CXXFLAGS)
+
+Default\ Profile/saveSnapDialog.o: $(GLOBALDEPS) saveSnapDialog.cpp SaveSnapDialog.h HardSettings.h
+	$(CPP) -c saveSnapDialog.cpp -o "Default Profile/saveSnapDialog.o" $(CXXFLAGS)
+
+Default\ Profile/progress.o: $(GLOBALDEPS) progress.cpp progress.h
+	$(CPP) -c progress.cpp -o "Default Profile/progress.o" $(CXXFLAGS)
+
+Default\ Profile/glew.o: $(GLOBALDEPS) glewsrc/glew.c
+	$(CPP) -c glewsrc/glew.c -o "Default Profile/glew.o" $(CXXFLAGS)
+
+Default\ Profile/trackball.o: $(GLOBALDEPS) ../../vcg/wrap/gui/trackball.cpp ../../vcg/wrap/gui/trackball.h
+	$(CPP) -c ../../vcg/wrap/gui/trackball.cpp -o "Default Profile/trackball.o" $(CXXFLAGS)
+
+Default\ Profile/trackmode.o: $(GLOBALDEPS) ../../vcg/wrap/gui/trackmode.cpp
+	$(CPP) -c ../../vcg/wrap/gui/trackmode.cpp -o "Default Profile/trackmode.o" $(CXXFLAGS)
+
+#Default\ Profile/qutemol_private.res: Default\ Profile/qutemol_private.rc main.rc 
+Default\ Profile/qutemol_private.res: main.rc 
+	$(WINDRES) --input-format=rc -o "Default Profile/qutemol_private.res" $(RCINCS) DEFAUL~1/main.RC -O coff
diff --git a/cad/plugins/QuteMol/packaging/Win32/QMX_installer.nsi b/cad/plugins/QuteMol/packaging/Win32/QMX_installer.nsi
index 2a79d69f5..b804dca44 100644
--- a/cad/plugins/QuteMol/packaging/Win32/QMX_installer.nsi
+++ b/cad/plugins/QuteMol/packaging/Win32/QMX_installer.nsi
@@ -1,7 +1,7 @@
 ; Script generated by the HM NIS Edit Script Wizard.
 
 ; HM NIS Edit Wizard helper defines
-!define PRODUCT_VERSION "0.5.0"
+!define PRODUCT_VERSION "0.5.1"
 !define PRODUCT_NAME "QuteMolX"
 !define PRODUCT_PUBLISHER "Nanorex, Inc"
 !define PRODUCT_WEB_SITE "http://www.nanoengineer-1.com/QuteMolX/"
@@ -56,7 +56,7 @@ Section "QuteMolX (Required)" SEC_QMX_BASE
   SetOutPath "$INSTDIR"
   SetOverwrite try
   File ".\License.txt"
-  File "..\ReadMe.html"
+  File ".\ReadMe.html"
   File "build\*"
   SetOutPath "$INSTDIR\image"
   File "build\image\*"
@@ -122,9 +122,9 @@ Section Uninstall
   ;RMDir /r "$INSTDIR\image"
   RMDir /r "$INSTDIR\source"
   RMDir /r "$INSTDIR"
-  RMDir /r "$PROGRAMFILES\Nanorex"
+  RMDir "$PROGRAMFILES\Nanorex"
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
   DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
   SetAutoClose true
-SectionEnd
-\ No newline at end of file
+SectionEnd
diff --git a/cad/plugins/QuteMol/packaging/Win32/main.rc b/cad/plugins/QuteMol/packaging/Win32/main.rc
new file mode 100644
index 000000000..1b4457e48
--- /dev/null
+++ b/cad/plugins/QuteMol/packaging/Win32/main.rc
@@ -0,0 +1,19 @@
+// note that the icon used by the Explorer (i.e. the programs icon) is the
+// first icon in the executable and the icons are sorted both by their order
+// (Win9x) and by alphabetically (!) (NT), so put this icon first and give it
+// a name starting with "a"
+aaaaaaaa ICON "image/qutemol.ico" 
+
+sample ICON "image/qutemol.ico"
+//snap_off2 BITMAP "image/snap_off2.png"
+//logo BITMAP "image/logo.png"
+
+
+// set this to 1 if you don't want to use manifest resource (manifest resource
+// is needed to enable visual styles on Windows XP - see docs/msw/winxp.txt
+// for more information)
+#define wxUSE_NO_MANIFEST 0
+
+// this is not always needed but doesn't hurt (except making the executable
+// very slightly larger): this file contains the standard icons, cursors, ...
+#include <wx/msw/wx.rc>
diff --git a/cad/plugins/QuteMol/packaging/Win32/qutemol_private.rc b/cad/plugins/QuteMol/packaging/Win32/qutemol_private.rc
new file mode 100644
index 000000000..4adc7e4be
--- /dev/null
+++ b/cad/plugins/QuteMol/packaging/Win32/qutemol_private.rc
@@ -0,0 +1,5 @@
+/* THIS FILE WILL BE OVERWRITTEN BY DEV-C++ */
+/* DO NOT EDIT! */
+
+#include "main.rc"
+
diff --git a/cad/plugins/QuteMol/packaging/buildWin.sh b/cad/plugins/QuteMol/packaging/buildWin.sh
new file mode 100644
index 000000000..62280aa09
--- /dev/null
+++ b/cad/plugins/QuteMol/packaging/buildWin.sh
@@ -0,0 +1,77 @@
+#!/bin/sh -x
+
+# Usage: Run ./buildWin.sh from the packaging directory.
+
+# This build requires the existance of a QuteMolX-prereqs.tar.gz which must
+# reside in c:\build_prereqs.  The contents of the file are source directories
+# for vcg and glew, plus a libpng-3.dll file that is also needed for build.
+cd ..
+TOP_LEVEL=`pwd`
+
+rm -rf $TOP_LEVEL/packaging/Win32/install
+
+if [ ! -e "/c/QMX_Install" ]
+then
+# Make a tarball of the uncompiled source for later.
+  tar -cz -X ../../../packaging/Win32/exclude_files.txt -f /c/QMX_source.tar.gz qutemol || exit 1
+
+#  Do a basic check on the directory structure
+  if [ ! -e "$TOP_LEVEL/qutemol/src" ]; then
+    echo "Incompatible directory structure."
+    exit 1
+  fi
+
+
+# Start with the main build
+# Build the base .exe and directory contents
+  rm -rf $TOP_LEVEL/qutemol/src/Default\ Profile
+  tar -xzf /c/build_prereqs/QuteMolX-prereqs.tar.gz || exit 1
+  cd $TOP_LEVEL/qutemol/src || exit 1
+  cp ../../packaging/Win32/Makefile . || exit 1
+  make clean || exit 1
+  mkdir $TOP_LEVEL/qutemol/src/Default\ Profile || exit 1
+  cp ../../packaging/Win32/main.rc Default\ Profile || exit 1
+  #cp ../../packaging/Win32/qutemol_private.rc Default\ Profile || exit 1
+  make || exit 1
+
+  mkdir $TOP_LEVEL/packaging/Win32/install || exit 1
+  mkdir $TOP_LEVEL/packaging/Win32/install/build || exit 1
+  mkdir $TOP_LEVEL/packaging/Win32/install/source || exit 1
+  cd Default\ Profile || exit 1
+  cp -R ../image . || exit 1 
+  cp -R ../presets . || exit 1
+  find . -depth -type d -name ".svn" -print -exec rm -rf {} \; 
+  cp -R * $TOP_LEVEL/packaging/Win32/install/build || exit 1
+  cd $TOP_LEVEL/packaging/Win32/install/source || exit 1
+  tar -xzf /c/QMX_source.tar.gz || exit 1
+
+  cd $TOP_LEVEL
+  cp $TOP_LEVEL/libpng-3.dll $TOP_LEVEL/packaging/Win32/install/build || exit 1
+  cd $TOP_LEVEL/packaging/Win32/install
+  find . -depth -type d -name ".svn" -print -exec rm -rf {} \; 
+  mkdir /c/QMX_Install
+  if [ "$?" = "0" ]
+  then
+    cp -R build /c/QMX_Install
+    cp -r source /c/QMX_Install
+  else
+    echo "Problem creating binary storage directory"
+    echo "Fix this or you will rebuild QuteMolX every time"
+  fi
+else
+  mkdir $TOP_LEVEL/packaging/Win32/install || exit 1
+  cd /c/QMX_Install
+  cp -R build $TOP_LEVEL/packaging/Win32/install
+  cp -R source $TOP_LEVEL/packaging/Win32/install
+fi
+cd $TOP_LEVEL/packaging/Win32
+for name in `echo install.ico install-header.bmp License.txt uninstall.ico wizard-sidebar.bmp QMX_installer.nsi ../ReadMe.html`
+do
+  cp $name install
+done
+
+
+# Create the installer
+cd $TOP_LEVEL/packaging/Win32/install
+"c:/program files/nsis/makensis.exe" QMX_installer.nsi
+
author	Derrick Hendricks <derrick@nanorex.com>	2008-07-24 16:03:05 +0000
committer	Derrick Hendricks <derrick@nanorex.com>	2008-07-24 16:03:05 +0000
commit	55d5fd6a550d62fbfb43c25c9f12bac0e71be41d (patch)
tree	b28365370e2e08b263a417435d8fce3aba813e21
parent	50b8c011d474e30a4e76c57ccd1ce7470add70a1 (diff)
download	nanoengineer-theirix-55d5fd6a550d62fbfb43c25c9f12bac0e71be41d.tar.gz nanoengineer-theirix-55d5fd6a550d62fbfb43c25c9f12bac0e71be41d.zip