mirror of https://github.com/CGAL/cgal
Mac OS X cleaning
This commit is contained in:
Sébastien Loriot
parent
3deebceb97
commit
1c50e0bede
|
|
@ -58,7 +58,6 @@ Scripts/developer_scripts/check_svn_keywords text eol=lf
|
|||
Scripts/developer_scripts/create_cgal_test text eol=lf
|
||||
Scripts/developer_scripts/create_cgal_test_with_cmake text eol=lf
|
||||
Scripts/developer_scripts/create_internal_release text eol=lf
|
||||
Scripts/developer_scripts/create_macosx_installer text eol=lf
|
||||
Scripts/developer_scripts/create_new_release text eol=lf
|
||||
Scripts/developer_scripts/detect_files_with_mixed_eol_styles text eol=lf
|
||||
Scripts/developer_scripts/detect_packages_licenses text eol=lf
|
||||
|
|
|
|||
|
|
@ -1058,7 +1058,7 @@ cmake_install.cmake
|
|||
*~
|
||||
.#*
|
||||
|
||||
# MacOS file https://en.wikipedia.org/wiki/.DS_Store
|
||||
# macOS file https://en.wikipedia.org/wiki/.DS_Store
|
||||
.DS_Store
|
||||
|
||||
# Binaries:
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ supporting C++17 or later.
|
|||
| | `Clang` \cgalFootnote{<A HREF="https://clang.llvm.org/">\cgalFootnoteCode{https://clang.llvm.org/}</A>} compiler version 15.0.7 |
|
||||
| \ms Windows | \gnu `g++` 11.4.0 or later\cgalFootnote{<A HREF="https://gcc.gnu.org/">\cgalFootnoteCode{https://gcc.gnu.org/}</A>} |
|
||||
| | \ms Visual `C++` 15.9, 16.10, 17.0 (\visualstudio 2017, 2019, and 2022)\cgalFootnote{<A HREF="https://visualstudio.microsoft.com/">\cgalFootnoteCode{https://visualstudio.microsoft.com/}</A>} |
|
||||
| MacOS X | \gnu `g++` 11.4.0 or later\cgalFootnote{<A HREF="https://gcc.gnu.org/">\cgalFootnoteCode{https://gcc.gnu.org/}</A>} |
|
||||
| macOS | \gnu `g++` 11.4.0 or later\cgalFootnote{<A HREF="https://gcc.gnu.org/">\cgalFootnoteCode{https://gcc.gnu.org/}</A>} |
|
||||
| | Apple `Clang` compiler versions 10.0.1, 12.0.5, and 15.0.0 |
|
||||
|
||||
<!-- Windows supported version are also listed on windows.html (must change both) -->
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@
|
|||
# CORE_INCLUDE_DIR - the CORE include directory
|
||||
# CORE_LIBRARIES - Libraries needed to use CORE
|
||||
|
||||
# TODO: support Windows and MacOSX
|
||||
|
||||
# CORE needs GMP
|
||||
include(FindPackageHandleStandardArgs)
|
||||
|
||||
|
|
@ -17,7 +15,7 @@ if(GMP_FOUND)
|
|||
find_path(CORE_INCLUDE_DIR NAMES CORE.h DOC "The directory containing the CORE include files")
|
||||
|
||||
find_library(CORE_LIBRARIES NAMES core++ DOC "Path to the core++ library")
|
||||
|
||||
|
||||
get_filename_component(CORE_LIBRARIES_DIR ${CORE_LIBRARIES} PATH)
|
||||
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(CORE "DEFAULT_MSG" CORE_LIBRARIES CORE_INCLUDE_DIR )
|
||||
|
|
|
|||
|
|
@ -5,8 +5,6 @@
|
|||
# GMP_LIBRARIES_DIR - directory where the GMP libraries are located
|
||||
# GMP_LIBRARIES - Link these to use GMP
|
||||
|
||||
# TODO: support MacOSX
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/CGAL_GeneratorSpecificSettings.cmake)
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,6 @@
|
|||
# GMPXX_INCLUDE_DIR - the GMPXX include directory
|
||||
# GMPXX_LIBRARIES - Libraries needed to use GMPXX
|
||||
|
||||
# TODO: support Windows and MacOSX
|
||||
|
||||
# GMPXX needs GMP
|
||||
|
||||
find_package( GMP QUIET )
|
||||
|
|
|
|||
|
|
@ -4,8 +4,6 @@
|
|||
# MPFR_LIBRARIES_DIR - Directory where the MPFR libraries are located
|
||||
# MPFR_LIBRARIES - the MPFR libraries
|
||||
|
||||
# TODO: support MacOSX
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/CGAL_GeneratorSpecificSettings.cmake)
|
||||
|
||||
|
|
|
|||
|
|
@ -243,20 +243,6 @@
|
|||
# define CGAL_SUNPRO_INITIALIZE(C)
|
||||
#endif
|
||||
|
||||
//----------------------------------------------------------------------//
|
||||
// MacOSX specific.
|
||||
//----------------------------------------------------------------------//
|
||||
|
||||
#ifdef __APPLE__
|
||||
# if defined(__GNUG__) && (__GNUG__ == 4) && (__GNUC_MINOR__ == 0) \
|
||||
&& defined(__OPTIMIZE__) && !defined(CGAL_NO_WARNING_FOR_MACOSX_GCC_4_0_BUG)
|
||||
# warning "Your configuration may exhibit run-time errors in CGAL code"
|
||||
# warning "This appears with g++ 4.0 on MacOSX when optimizing"
|
||||
# warning "You can disable this warning using -DCGAL_NO_WARNING_FOR_MACOSX_GCC_4_0_BUG"
|
||||
# warning "For more information, see https://www.cgal.org/FAQ.html#mac_optimization_bug"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
//-------------------------------------------------------------------//
|
||||
// When the global min and max are no longer defined (as macros)
|
||||
// because of NOMINMAX flag definition, we define our own global
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1 +0,0 @@
|
|||
Foundation for Research and Technology-Hellas (Greece).
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
Package for MacOSX support.
|
||||
Contains scripts and icon files needed for creating demos
|
||||
in the MacOSX operating system.
|
||||
|
|
@ -1 +0,0 @@
|
|||
Menelaos Karavelas <mkaravel@tem.uoc.gr>
|
||||
|
|
@ -1,102 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Copyright (c) 2005,2006,2013
|
||||
# Foundation for Research and Technology-Hellas (Greece).
|
||||
# All rights reserved.
|
||||
#
|
||||
# This file is part of CGAL (www.cgal.org); you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public License as
|
||||
# published by the Free Software Foundation; version 3 of the License,
|
||||
# or (at your option) any later version.
|
||||
#
|
||||
# Licensees holding a valid commercial license may use this file in
|
||||
# accordance with the commercial license agreement provided with the software.
|
||||
#
|
||||
# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
||||
# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
#
|
||||
# $URL$
|
||||
# $Id$
|
||||
# SPDX-License-Identifier: LGPL-3.0-or-later OR LicenseRef-Commercial
|
||||
#
|
||||
# Authors: Herve Bronnimann
|
||||
# Menelaos Karavelas
|
||||
# Eric Berberich <eric.berberich@cgal.org>
|
||||
|
||||
# This script creates the appropriate directory structure so that a CGAL
|
||||
# Qt demo can be run on MacOSX
|
||||
|
||||
usage()
|
||||
{
|
||||
echo "Usage: cgal_make_macosx_app executable"
|
||||
}
|
||||
|
||||
|
||||
case $# in
|
||||
0) usage
|
||||
exit 1
|
||||
esac
|
||||
|
||||
|
||||
for i do
|
||||
if [ -x "$i" ] ; then
|
||||
EXECUTABLE=$i
|
||||
else
|
||||
usage
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -z "$EXECUTABLE.app" ] ; then
|
||||
mkdir $EXECUTABLE.app
|
||||
fi
|
||||
|
||||
test -d $EXECUTABLE.app/Contents/MacOS/ || mkdir -p $EXECUTABLE.app/Contents/MacOS/
|
||||
strip $EXECUTABLE
|
||||
cp $EXECUTABLE $EXECUTABLE.app/Contents/MacOS/$EXECUTABLE
|
||||
|
||||
rm -f $EXECUTABLE.app/Contents/PkgInfo
|
||||
echo "APPL????" > $EXECUTABLE.app/Contents/PkgInfo
|
||||
|
||||
rm -f $EXECUTABLE.app/Contents/Info.plist
|
||||
cat > $EXECUTABLE.app/Contents/Info.plist <<ENDINFO
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist SYSTEM
|
||||
"file://localhost/System/Library/DTDs/PropertyList.dtd">
|
||||
<plist version=\"0.9\">
|
||||
<dict>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>cgal_app.icns</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string>Created by CGAL</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>ttxt</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$EXECUTABLE</string>
|
||||
ENDINFO
|
||||
|
||||
if [ -d "help" ] ; then
|
||||
cat >> $EXECUTABLE.app/Contents/Info.plist <<ENDINFO
|
||||
<key>CFBundleHelpBookFolder</key>
|
||||
<string>Help</string>
|
||||
<key>CFBundleHelpBookName</key>
|
||||
<string>Help</string>
|
||||
ENDINFO
|
||||
test -d $EXECUTABLE.app/Contents/Resources/Help || mkdir -p $EXECUTABLE.app/Contents/Resources/Help
|
||||
cp -r help/* $EXECUTABLE.app/Contents/Resources/Help
|
||||
ln -s index.html $EXECUTABLE.app/Contents/Resources/Help/Help.html
|
||||
fi
|
||||
|
||||
cat >> $EXECUTABLE.app/Contents/Info.plist <<ENDINFO
|
||||
<key>NOTE</key>
|
||||
<string>This file was generated by CGAL/scripts/cgal_make_macosx_app.</string>
|
||||
</dict>
|
||||
</plist>
|
||||
ENDINFO
|
||||
|
||||
test -d $EXECUTABLE.app/Contents/Resources || mkdir -p $EXECUTABLE.app/Contents/Resources
|
||||
DIR=$( cd "$( dirname "$0" )" && pwd )
|
||||
cp $DIR/../auxiliary/cgal_app.icns $EXECUTABLE.app/Contents/Resources
|
||||
echo "created $EXECUTABLE.app ..."
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
#include <CGAL/config.h>
|
||||
#include <CGAL/assertions.h>
|
||||
|
||||
// This has only been implemented for MacOSX/Darwin, Linux and VC++ for now.
|
||||
// This has only been implemented for macOS/Darwin, Linux and VC++ for now.
|
||||
#if !defined _MSC_VER && !defined __linux__ && !defined __APPLE__
|
||||
|
||||
#include <iostream>
|
||||
|
|
|
|||
|
|
@ -1,78 +0,0 @@
|
|||
#!/bin/tcsh
|
||||
#
|
||||
# create the MacOSX CGAL disk image and package
|
||||
#
|
||||
# For releases 3.2 and on
|
||||
#
|
||||
# The script assumes that the current directory is the MacOSX_Installer
|
||||
# directory of the Maintenance package
|
||||
#
|
||||
# Author(s): Menelaos Karavelas, 2006
|
||||
|
||||
# Modify the following lines according to your release and configuration
|
||||
|
||||
# modify the following line for your release
|
||||
setenv CGALVER $2
|
||||
|
||||
# modify the following line to reflect the size of the disk image you
|
||||
# want to create
|
||||
setenv VOLSIZE 7m
|
||||
|
||||
# modify the following lines if the MacOSX applications reside at different
|
||||
# paths than the ones shown below
|
||||
setenv HDIUTIL /usr/bin/hdiutil
|
||||
setenv PACKAGEMAKERAPP /Developer/Applications/Utilities/PackageMaker.app
|
||||
setenv PACKAGEMAKER ${PACKAGEMAKERAPP}/Contents/MacOS/PackageMaker
|
||||
|
||||
# this is the directory where the script temporarily puts files
|
||||
setenv TMP_ROOT /tmp/MacOSX_Installer
|
||||
|
||||
####### DO NOT TOUCH ANYTHING BEYIND THIS POINT #######
|
||||
setenv CUR_DIR `pwd`
|
||||
setenv VOLNAME CGAL-${CGALVER}
|
||||
|
||||
# cleanup files that should not be there
|
||||
rm -f ${VOLNAME}.dmg
|
||||
rm -fr ${TMP_ROOT}
|
||||
|
||||
# create a copy of the CGAL package structure
|
||||
mkdir -p ${TMP_ROOT}
|
||||
cp -rp Package_root ${TMP_ROOT}
|
||||
cp -rp Resources ${TMP_ROOT}
|
||||
cp -rp CGAL-absolute.pmproj ${TMP_ROOT}
|
||||
cd ${TMP_ROOT}
|
||||
|
||||
# copy the CGAL tarball at its correct place and uncompress it
|
||||
cp -p $1 Package_root
|
||||
cd Package_root
|
||||
tar xvfz CGAL-${CGALVER}.tar.gz
|
||||
rm -f CGAL-${CGALVER}.tar.gz
|
||||
|
||||
# now the building phase starts
|
||||
cd ..
|
||||
|
||||
# build the package
|
||||
${PACKAGEMAKER} -build -ds -proj CGAL-absolute.pmproj -p CGAL.pkg -v
|
||||
|
||||
# create the disk image
|
||||
${HDIUTIL} create -ov -size ${VOLSIZE} -fs HFS+ -type UDIF -volname ${VOLNAME} CGAL-tmp.dmg
|
||||
|
||||
# mount the disk image
|
||||
${HDIUTIL} attach CGAL-tmp.dmg
|
||||
|
||||
# move the CGAL package to the disk image
|
||||
mv CGAL.pkg /Volumes/${VOLNAME}
|
||||
|
||||
# unmount the disk image
|
||||
${HDIUTIL} detach /Volumes/${VOLNAME}
|
||||
|
||||
# convert the disk image to a read-only one
|
||||
${HDIUTIL} convert -ov CGAL-tmp.dmg -format UDRO -o CGAL-RO.dmg
|
||||
rm -f CGAL-tmp.dmg
|
||||
|
||||
# copy the converted disk image to the original directory
|
||||
cp -p CGAL-RO.dmg ${CUR_DIR}/${VOLNAME}.dmg
|
||||
|
||||
# cleanup temporary files
|
||||
rm -fr ${TMP_ROOT}
|
||||
|
||||
Loading…
Reference in New Issue