From 5d397ed8987efe801396c2faa72453773cf33803 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 29 Jul 2008 19:54:49 +0000
Subject: [PATCH] make framework
---
Makefile | 16 ++++++++++++++++
configure | 12 +++++++++---
configure.in | 12 +++++++++---
utils/misc/Info.plist | 4 ++--
utils/misc/Info_framework.plist | 12 ++++++++++++
5 files changed, 48 insertions(+), 8 deletions(-)
create mode 100644 utils/misc/Info_framework.plist
diff --git a/Makefile b/Makefile
index 975b898bba..4863654022 100644
--- a/Makefile
+++ b/Makefile
@@ -85,6 +85,22 @@ uninstall-lib:
rm -rf ${includedir}/gmsh
rm -rf ${libdir}/libGmsh${LIBSUFFIX}${LIBEXT}
+framework: lib
+ rm -rf Gmsh.framework
+ mkdir -p Gmsh.framework
+ mkdir -p Gmsh.framework/Versions
+ mkdir -p Gmsh.framework/Versions/A
+ mkdir -p Gmsh.framework/Versions/A/Headers
+ mkdir -p Gmsh.framework/Versions/A/Resources
+ cp lib/libGmsh${LIBEXT} Gmsh.framework/Versions/A/Gmsh
+ cp ${GMSH_API} Gmsh.framework/Versions/A/Headers/
+ sed -e "s/GMSH_VERSION/${GMSH_VERSION}/g" utils/misc/Info_framework.plist\
+ > Gmsh.framework/Versions/A/Resources/Info.plist
+ cd Gmsh.framework/Versions && ln -s A Current
+ cd Gmsh.framework && ln -s Versions/Current/Gmsh
+ cd Gmsh.framework && ln -s Versions/Current/Headers
+ cd Gmsh.framework && ln -s Versions/Current/Resources
+
embed:
@if [ -r ../getdp/contrib/gmsh/Makefile ]; then \
rsync -av ${GMSH_EMBEDDED} ../getdp/contrib/gmsh;\
diff --git a/configure b/configure
index c129aad5a2..492a5f47d5 100755
--- a/configure
+++ b/configure
@@ -1950,10 +1950,7 @@ fi
if test "x$enable_minimal" = "xyes"; then
enable_gui=no;
- enable_parser=no;
- enable_post=no;
enable_gsl=no;
-# enable_occ=no;
enable_fm=no;
enable_netgen=no;
enable_tetgen=no;
@@ -1963,6 +1960,15 @@ if test "x$enable_minimal" = "xyes"; then
enable_med=no;
enable_cgns=no;
enable_zlib=no;
+ if test "x$enable_post" != "xyes"; then
+ enable_post=no;
+ fi
+ if test "x$enable_parser" != "xyes"; then
+ enable_parser=no;
+ fi
+ if test "x$enable_occ" != "xyes"; then
+ enable_occ=no;
+ fi
CXXFLAGS=-O2;
fi
diff --git a/configure.in b/configure.in
index d65a12f6fb..2d811bde75 100644
--- a/configure.in
+++ b/configure.in
@@ -141,10 +141,7 @@ AC_ARG_ENABLE(minimal,
dnl "minimal" build shortcut
if test "x$enable_minimal" = "xyes"; then
enable_gui=no;
- enable_parser=no;
- enable_post=no;
enable_gsl=no;
-# enable_occ=no;
enable_fm=no;
enable_netgen=no;
enable_tetgen=no;
@@ -154,6 +151,15 @@ if test "x$enable_minimal" = "xyes"; then
enable_med=no;
enable_cgns=no;
enable_zlib=no;
+ if test "x$enable_post" != "xyes"; then
+ enable_post=no;
+ fi
+ if test "x$enable_parser" != "xyes"; then
+ enable_parser=no;
+ fi
+ if test "x$enable_occ" != "xyes"; then
+ enable_occ=no;
+ fi
CXXFLAGS=-O2;
fi
diff --git a/utils/misc/Info.plist b/utils/misc/Info.plist
index 7ad7b88d10..c7e001dcf1 100644
--- a/utils/misc/Info.plist
+++ b/utils/misc/Info.plist
@@ -5,8 +5,8 @@
<key>CFBundleName</key><string>Gmsh</string>
<key>CFBundleExecutable</key><string>Gmsh</string>
<key>CFBundlePackageType</key><string>APPL</string>
- <key>CFBundleVersion</key><string>2.1.0-cvs-20071228</string>
- <key>CFBundleShortVersionString</key><string>2.1.0-cvs-20071228</string>
+ <key>CFBundleVersion</key><string>GMSH_VERSION</string>
+ <key>CFBundleShortVersionString</key><string>GMSH_VERSION</string>
<key>CFBundleIconFile</key><string>Gmsh.icns</string>
<key>CFBundleSignature</key><string>GMSH</string>
<key>CFBundleGetInfoString</key><string>GMSH_VERSION, Copyright 1997-2008 C. Geuzaine and J.-F. Remacle</string>
diff --git a/utils/misc/Info_framework.plist b/utils/misc/Info_framework.plist
new file mode 100644
index 0000000000..7f5b1df3cf
--- /dev/null
+++ b/utils/misc/Info_framework.plist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+ <dict>
+ <key>CFBundleName</key><string>Gmsh</string>
+ <key>CFBundleExecutable</key><string>Gmsh</string>
+ <key>CFBundlePackageType</key><string>FMWK</string>
+ <key>CFBundleVersion</key><string>GMSH_VERSION</string>
+ <key>CFBundleSignature</key><string>GMSH</string>
+ <key>CFBundleIdentifier</key><string>org.geuz.Gmsh</string>
+ </dict>
+</plist>
--
GitLab