From 98875e2922fa5d3940fc97aeaa7fe64529b2cbeb Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 25 Feb 2006 07:58:12 +0000
Subject: [PATCH] Cygwin is GONE!
---
Common/DefaultOptions.h | 4 ----
Makefile | 9 ++++-----
README | 6 +-----
configure | 6 +++---
configure.in | 8 ++++----
doc/FAQ | 7 +------
doc/README.win32 | 36 ++----------------------------------
doc/VERSIONS | 4 +++-
doc/gmsh.html | 4 +---
doc/texinfo/gmsh.texi | 11 +++++------
utils/commercial/README | 3 +--
11 files changed, 25 insertions(+), 73 deletions(-)
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index e8161581b2..3cac14399f 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -111,11 +111,7 @@ StringXString MeshOptions_String[] = {
} ;
StringXString SolverOptions_String[] = {
-#if defined(WIN32) && !defined(__CYGWIN__)
{ F|O, "SocketName" , opt_solver_socket_name , "127.0.0.1:44122" ,
-#else
- { F|O, "SocketName" , opt_solver_socket_name , ".gmshsock" ,
-#endif
"Name of socket (TCP/IP if it contains the `:' character, UNIX otherwise)" },
{ F|O, "Name0" , opt_solver_name0 , "GetDP" ,
diff --git a/Makefile b/Makefile
index fffa595cde..0c9f4fa6e6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.413 2006-02-24 03:28:34 geuzaine Exp $
+# $Id: Makefile,v 1.414 2006-02-25 07:58:11 geuzaine Exp $
#
# Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
#
@@ -21,9 +21,9 @@
include variables
-GMSH_MAJOR_VERSION = 1
-GMSH_MINOR_VERSION = 63
-GMSH_PATCH_VERSION = 3
+GMSH_MAJOR_VERSION = 2
+GMSH_MINOR_VERSION = 0
+GMSH_PATCH_VERSION = 0
GMSH_EXTRA_VERSION = "-cvs"
GMSH_VERSION = ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}${GMSH_EXTRA_VERSION}
@@ -183,7 +183,6 @@ package-unix:
package-win:
rm -rf gmsh-${GMSH_VERSION}
mkdir gmsh-${GMSH_VERSION}
- cp /usr/bin/cygwin1.dll gmsh-${GMSH_VERSION}
cp bin/gmsh.exe gmsh-${GMSH_VERSION}
strip gmsh-${GMSH_VERSION}/gmsh.exe
cp doc/README.win32 gmsh-${GMSH_VERSION}/README.txt
diff --git a/README b/README
index 569e6c9450..c5e56aa5c2 100644
--- a/README
+++ b/README
@@ -13,11 +13,7 @@ http://sources.redhat.com/gsl/) and FLTK 1.1.x (configured with OpenGL
support; freely available from http://www.fltk.org). You can use the
--with-fltk-prefix and --with-gsl-prefix configure options (or define
the FLTK_PREFIX and GSL_PREFIX environment variables) if the libraries
-are not installed in their default locations. Please note that
-compiling the Windows version requires the Cygwin tools (freely
-available from http://www.cygwin.com) and a "cygwin-enabled" version
-of FLTK (i.e., you have to configure FLTK with "./configure
---enable-cygwin").
+are not installed in their default locations.
To install a non-graphical version of Gmsh (that does not require FLTK
nor OpenGL), type
diff --git a/configure b/configure
index 56053669d1..df48f98081 100755
--- a/configure
+++ b/configure
@@ -850,7 +850,7 @@ Optional Features:
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-gsl use GSL as numerical toolkit (default=yes)
--enable-gui build the graphical user interface (default=yes)
- --enable-cygwin use the Cygwin library on Windows (default=yes)
+ --enable-cygwin use the Cygwin library on Windows (default=no)
--enable-parallel enable parallel version (default=no)
--enable-jpeg enable JPEG support (default=yes)
--enable-zlib enable ZLIB support (default=yes)
@@ -2724,7 +2724,7 @@ POSTBUILD=""
case "$UNAME" in
CYGWIN*)
- if test "x$enable_cygwin" = "xno"; then
+ if test "x$enable_cygwin" != "xyes"; then
UNAME="${UNAME}-no-cygwin"
CC="${CC} -mno-cygwin"
CXX="${CXX} -mno-cygwin"
@@ -4281,7 +4281,7 @@ case "$UNAME" in
CYGWIN* | MINGW*)
LINKER="${LINKER} -mwindows"
- if test "x$enable_cygwin" = "xno"; then
+ if test "x$enable_cygwin" != "xyes"; then
FLAGS="${FLAGS} -DHAVE_NO_DLL"
fi
if test "x$enable_gui" != "xno"; then
diff --git a/configure.in b/configure.in
index d77a583283..72fd473da8 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.90 2006-02-25 03:07:37 geuzaine Exp $
+dnl $Id: configure.in,v 1.91 2006-02-25 07:58:12 geuzaine Exp $
dnl
dnl Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
dnl
@@ -59,7 +59,7 @@ AC_ARG_ENABLE(gui,
[build the graphical user interface (default=yes)]))
AC_ARG_ENABLE(cygwin,
AC_HELP_STRING([--enable-cygwin],
- [use the Cygwin library on Windows (default=yes)]))
+ [use the Cygwin library on Windows (default=no)]))
AC_ARG_ENABLE(parallel,
AC_HELP_STRING([--enable-parallel],
[enable parallel version (default=no)]))
@@ -109,7 +109,7 @@ POSTBUILD=""
dnl Take care of no-cygwin option before doing any other tests
case "$UNAME" in
CYGWIN*)
- if test "x$enable_cygwin" = "xno"; then
+ if test "x$enable_cygwin" != "xyes"; then
UNAME="${UNAME}-no-cygwin"
CC="${CC} -mno-cygwin"
CXX="${CXX} -mno-cygwin"
@@ -492,7 +492,7 @@ case "$UNAME" in
CYGWIN* | MINGW*)
LINKER="${LINKER} -mwindows"
- if test "x$enable_cygwin" = "xno"; then
+ if test "x$enable_cygwin" != "xyes"; then
FLAGS="${FLAGS} -DHAVE_NO_DLL"
fi
if test "x$enable_gui" != "xno"; then
diff --git a/doc/FAQ b/doc/FAQ
index 67d76a39d5..2654e84399 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -1,4 +1,4 @@
-$Id: FAQ,v 1.68 2005-11-22 03:15:49 geuzaine Exp $
+$Id: FAQ,v 1.69 2006-02-25 07:58:12 geuzaine Exp $
This is the Gmsh FAQ
@@ -60,11 +60,6 @@ with OpenGL support; freely available from http://www.fltk.org).
You'll also need the jpeg library if you want to save jpeg images, and
the libpng and zlib libraries if you want to save png images.
-Under Windows, you will need the Cygwin tools and compilers (freely
-available from http://www.cygwin.com), as well as a "cygwin-enabled"
-version of FLTK (i.e., you have to configure FLTK with './configure
---enable-cygwin').
-
* 2.4 How do I compile Gmsh?
Just type './configure; make; make install'. If you change some
diff --git a/doc/README.win32 b/doc/README.win32
index af7cbd4994..9bec49c2fc 100644
--- a/doc/README.win32
+++ b/doc/README.win32
@@ -1,4 +1,4 @@
-$Id: README.win32,v 1.6 2005-04-22 16:48:11 geuzaine Exp $
+$Id: README.win32,v 1.7 2006-02-25 07:58:12 geuzaine Exp $
1) About opengl32.dll and glu32.dll:
@@ -6,41 +6,9 @@ If your system complains about missing opengl32.dll or glu32.dll
libraries, then OpenGL is not properly installed... Go download OpenGL
on Microsoft's web site or on http://www.opengl.org.
-2) About cygwin1.dll:
-
-If you plan to use other programs than Gmsh that depend on the
-cygwin1.dll library, you should keep only one version of this library
-on your system (i.e., move cygwin1.dll to the Windows system
-directory--usually C:\Windows\System\--and suppress all other versions
-of cygwin1.dll). Failing to do so may result in an incorrect behavior
-of applications sharing the library and running simultaneously.
-
-3) About configuration files:
+2) About configuration files:
Gmsh saves session information and default options in the $GMSH_HOME
directory, or in the $HOME, $TMP or $TEMP directories if $GMSH_HOME is
not defined. If none of these variables are defined, Gmsh will
save/load its configuration files from the current working directory.
-
-4) Adjusting the Cygwin memory limit:
-
-From the <cygwin at cygwin.com> mailing list archive (Charles Werner
-<cw at gamma-rs dot ch>, Tue 04 Feb 2003 10:31:03 +0100):
-
-Cygwin comes with a maximum program size (program+data) of 384
-MB. This means that by default no program can allocate more than
-this. To run using more real or virtual memory in your machine you
-must add a entry in the Cygwin HKEY_CURRENT_USER section of the
-registry. Add the DWORD value heap_chunk_in_mb and set it to desired
-memory limit in decimal MB using the regtool program included in the
-Cygwin cygutils package. In this example the limit is set to 1024 MB:
-
-regtool -i set /HKCU/Software/Cygnus\ Solutions/Cygwin/heap_chunk_in_mb 1024
-regtool -v list /HKCU/Software/Cygnus\ Solutions/Cygwin
-
-Exit all running Cygwin processes and restart them. Memory can be
-allocated up to the size of the system swap space minus any the size
-of any running processes. The system swap should be at least as large
-as the physically installed RAM and can be modified under the System
-category in the Control Panel accessible through the Settings tag of
-the Win32 Start menu.
diff --git a/doc/VERSIONS b/doc/VERSIONS
index 930b8e2226..68b7e6d634 100644
--- a/doc/VERSIONS
+++ b/doc/VERSIONS
@@ -1,4 +1,6 @@
-$Id: VERSIONS,v 1.358 2006-01-30 03:43:18 geuzaine Exp $
+$Id: VERSIONS,v 1.359 2006-02-25 07:58:12 geuzaine Exp $
+
+New in 2.0.0: Windows versions do no depend on Cygwin anymore.
New in 1.63: post-processing views can now be exported as meshes;
improved background mesh handling (a lot faster, and more accurate);
diff --git a/doc/gmsh.html b/doc/gmsh.html
index 1e4175787c..de58cc641b 100644
--- a/doc/gmsh.html
+++ b/doc/gmsh.html
@@ -306,9 +306,7 @@ href="#build-footmark"><sup>2</sup></a>You need the <a
href="http://sources.redhat.com/gsl/">GSL (>= 1.2)</a> and <a
href="http://www.fltk.org/">FLTK (1.1.x)</a> libraries properly
installed on your system in order to compile Gmsh. Non-graphical
-versions can be compiled without FLTK. Compiling the Windows version
-requires the <a href="http://www.cygwin.com/">Cygwin</a> tools and
-compilers.
+versions can be compiled without FLTK.
<p>
Back to <a href="/">geuz.org</a>
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index 248e6ebda7..ccae3a5695 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -1,5 +1,5 @@
\input texinfo.tex @c -*-texinfo-*-
-@c $Id: gmsh.texi,v 1.200 2006-02-17 14:35:07 geuzaine Exp $
+@c $Id: gmsh.texi,v 1.201 2006-02-25 07:58:12 geuzaine Exp $
@c
@c Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
@c
@@ -3683,11 +3683,10 @@ graphics and FLTK for the widget set. See @uref{http://www.opengl.org},
information.
Gmsh's build system is based on autoconf, and should work on most modern
-platforms providing standard compliant C and C++ compilers. Practical notes
-on how to compile Gmsh's source code are included in the distribution. Note
-that compiling the Windows version requires the Cygwin tools (freely
-available from @uref{http://www.cygwin.com}). See @ref{Frequently asked
-questions}, for more information.
+platforms providing standard compliant C and C++ compilers. Practical
+notes on how to compile Gmsh's source code are included in the
+distribution. See @ref{Frequently asked questions}, for more
+information.
@menu
* Coding style::
diff --git a/utils/commercial/README b/utils/commercial/README
index 28e7ef07fc..3c1a59a73e 100644
--- a/utils/commercial/README
+++ b/utils/commercial/README
@@ -10,8 +10,7 @@ make install
This requires FLTK 1.1.x (configured with OpenGL support; freely
available from http://www.fltk.org) to be properly installed on your
-system. Please note that compiling the Windows version requires the
-Cygwin tools (freely available from http://www.cygwin.com).
+system.
To install a non-graphical version of Gmsh (that does not require FLTK
nor OpenGL), type
--
GitLab