diff --git a/.gitignore b/.gitignore index 2b0b55c63..e79d9d741 100644 --- a/.gitignore +++ b/.gitignore @@ -116,11 +116,7 @@ /fluid/*.ilk /fluid/*.pdb /fluid/TAGS - -# /fluid/fluid.app/Contents/MacOS/ -/fluid/fluid.app/Contents/MacOS/fluid - -# /fluid/pixmaps/ +/fluid/fluid.app /fluid/pixmaps/*.bck # /ide/VisualC2008/ @@ -294,89 +290,7 @@ /test/fltk*.exp /test/fltk*.dll -# /test/blocks.app/Contents/MacOS/ -/test/blocks.app/Contents/MacOS/blocks - -# /test/checkers.app/Contents/MacOS/ -/test/checkers.app/Contents/MacOS/checkers - -# /test/sudoku.app/Contents/MacOS/ -/test/sudoku.app/Contents/MacOS/sudoku - # /test/ - generated apps (macOS) -/test/CubeView.app/ -/test/adjuster.app/ -/test/animated.app/ -/test/arc.app/ -/test/ask.app/ -/test/bitmap.app/ -/test/boxtype.app/ -/test/browser.app/ -/test/button.app/ -/test/buttons.app/ -/test/cairo_test.app/ -/test/clock.app/ -/test/colbrowser.app/ -/test/color_chooser.app/ -/test/cube.app/ -/test/cursor.app/ -/test/curve.app/ -/test/demo.app/ -/test/device.app/ -/test/doublebuffer.app/ -/test/editor.app/ -/test/fast_slow.app/ -/test/file_chooser.app/ -/test/fltk-versions.app/ -/test/fonts.app/ -/test/forms.app/ -/test/fractals.app/ -/test/fullscreen.app/ -/test/gl_overlay.app/ -/test/glpuzzle.app/ -/test/hello.app/ -/test/help.app/ -/test/icon.app/ -/test/iconize.app/ -/test/image.app/ -/test/inactive.app/ -/test/input.app/ -/test/input_choice.app/ -/test/keyboard.app/ -/test/label.app/ -/test/line_style.app/ -/test/list_visuals.app/ -/test/mandelbrot.app/ -/test/menubar.app/ -/test/message.app/ -/test/minimum.app/ -/test/native-filechooser.app/ -/test/navigation.app/ -/test/offscreen.app/ -/test/output.app/ -/test/overlay.app/ -/test/pack.app/ -/test/pixmap.app/ -/test/pixmap_browser.app/ -/test/preferences.app/ -/test/radio.app/ -/test/resize.app/ -/test/resizebox.app/ -/test/rotated_text.app/ -/test/scroll.app/ -/test/shape.app/ -/test/subwindow.app/ -/test/symbols.app/ -/test/table.app/ -/test/tabs.app/ -/test/threads.app/ -/test/tile.app/ -/test/tiled_image.app/ -/test/tree.app/ -/test/twowin.app/ -/test/unittests.app/ -/test/utf8.app/ -/test/valuators.app/ -/test/windowfocus.app/ +/test/*.app **/.DS_Store diff --git a/CMake/fl_create_example.cmake b/CMake/fl_create_example.cmake index 3f1398526..59a78d2b1 100644 --- a/CMake/fl_create_example.cmake +++ b/CMake/fl_create_example.cmake @@ -27,7 +27,7 @@ # Sources can be: # - .c/.cxx files, e.g. 'hello.cxx' # - .fl (fluid) files, e.g. 'radio.fl' -# - .plist file (macOS), e.g. 'editor-Info.plist' +# - .plist file (macOS), e.g. 'editor.plist' # - .icns file (macOS Icon), e.g. 'checkers.icns' # - .rc file (Windows resource file, e.g. icon definition) # @@ -39,6 +39,7 @@ # all other file types are added to the target's source files. # # macOS specific .icns and .plist files are ignored on other platforms. +# These files must resided in the subdirectory 'mac-resources'. # # - LIBRARIES: # List of libraries (CMake target names), separated by ';'. Needs @@ -129,7 +130,8 @@ macro (CREATE_EXAMPLE NAME SOURCES LIBRARIES) endif (ICON_PATH) if (PLIST) - set_target_properties (${TARGET_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/${PLIST}") + set_target_properties (${TARGET_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST + "${CMAKE_CURRENT_SOURCE_DIR}/mac-resources/${PLIST}") elseif (MAC_BUNDLE) set_target_properties (${TARGET_NAME} PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "${TARGET_NAME}") set_target_properties (${TARGET_NAME} PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.fltk.${TARGET_NAME}") diff --git a/fltk.list.in b/fltk.list.in index 872333c6a..9f2a823e0 100644 --- a/fltk.list.in +++ b/fltk.list.in @@ -107,7 +107,6 @@ f 0555 root sys $libdir/libfltk_gl.so.@FL_DSO_VERSION@ src/libfltk_gl.so.@FL_DSO d 0555 root sys /Applications/fluid.app - d 0555 root sys /Applications/fluid.app/Contents - f 0444 root sys /Applications/fluid.app/Contents/Info.plist fluid/fluid.app/Contents/Info.plist -f 0444 root sys /Applications/fluid.app/Contents/PkgInfo fluid/fluid.app/Contents/PkgInfo d 0555 root sys /Applications/fluid.app/Contents/MacOS - l 0555 root sys /Applications/fluid.app/Contents/MacOS/fluid $bindir/fluid d 0555 root sys /Applications/fluid.app/Contents/Resources - @@ -376,7 +375,6 @@ f 0444 root sys $docdir/examples/ test/*.h d 0555 root sys /Applications/blocks.app - d 0555 root sys /Applications/blocks.app/Contents - f 0444 root sys /Applications/blocks.app/Contents/Info.plist test/blocks.app/Contents/Info.plist -f 0444 root sys /Applications/blocks.app/Contents/PkgInfo test/blocks.app/Contents/PkgInfo d 0555 root sys /Applications/blocks.app/Contents/MacOS - f 0555 root sys /Applications/blocks.app/Contents/MacOS/blocks test/blocks d 0555 root sys /Applications/blocks.app/Contents/Resources - @@ -386,7 +384,6 @@ f 0444 root sys /Applications/blocks.app/Contents/Resources/blocks.icns test/blo d 0555 root sys /Applications/checkers.app - d 0555 root sys /Applications/checkers.app/Contents - f 0444 root sys /Applications/checkers.app/Contents/Info.plist test/checkers.app/Contents/Info.plist -f 0444 root sys /Applications/checkers.app/Contents/PkgInfo test/checkers.app/Contents/PkgInfo d 0555 root sys /Applications/checkers.app/Contents/MacOS - f 0555 root sys /Applications/checkers.app/Contents/MacOS/checkers test/checkers d 0555 root sys /Applications/checkers.app/Contents/Resources - @@ -396,7 +393,6 @@ f 0444 root sys /Applications/checkers.app/Contents/Resources/checkers.icns test d 0555 root sys /Applications/sudoku.app - d 0555 root sys /Applications/sudoku.app/Contents - f 0444 root sys /Applications/sudoku.app/Contents/Info.plist test/sudoku.app/Contents/Info.plist -f 0444 root sys /Applications/sudoku.app/Contents/PkgInfo test/sudoku.app/Contents/PkgInfo d 0555 root sys /Applications/sudoku.app/Contents/MacOS - f 0555 root sys /Applications/sudoku.app/Contents/MacOS/sudoku test/sudoku d 0555 root sys /Applications/sudoku.app/Contents/Resources - diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt index de6788ea9..472c84c20 100644 --- a/fluid/CMakeLists.txt +++ b/fluid/CMakeLists.txt @@ -46,7 +46,7 @@ endif (WIN32) if (APPLE AND (NOT OPTION_APPLE_X11)) set (ICON_NAME fluid.icns) - set (ICON_PATH "${PROJECT_SOURCE_DIR}/fluid/fluid.app/Contents/Resources/${ICON_NAME}") + set (ICON_PATH "${CMAKE_CURRENT_SOURCE_DIR}/icons/${ICON_NAME}") add_executable (fluid MACOSX_BUNDLE ${CPPFILES} ${ICON_PATH}) # create macOS bundle wrapper script @@ -79,7 +79,7 @@ endif (FLTK_HAVE_CAIRO) if (APPLE AND (NOT OPTION_APPLE_X11)) # create bundle - set_target_properties (fluid PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/fluid/fluid.app/Contents/Info.plist") + set_target_properties (fluid PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/fluid.plist") set_target_properties (fluid PROPERTIES MACOSX_BUNDLE_ICON_FILE ${ICON_NAME}) set_target_properties (fluid PROPERTIES RESOURCE ${ICON_PATH}) # install diff --git a/fluid/Makefile b/fluid/Makefile index eb1b34605..1e5a42f60 100644 --- a/fluid/Makefile +++ b/fluid/Makefile @@ -1,7 +1,7 @@ # # FLUID Makefile for the Fast Light Tool Kit (FLTK). # -# Copyright 1998-2020 by Bill Spitzak and others. +# Copyright 1998-2021 by Bill Spitzak and others. # # This library is free software. Distribution and use rights are outlined in # the file "COPYING" which should have been included with this file. If this @@ -49,9 +49,11 @@ fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \ $(IMGLIBNAME) echo Linking $@... $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDFLAGS) $(LDLIBS) - $(OSX_ONLY) $(RM) -r -f fluid.app/Contents/MacOS - $(OSX_ONLY) mkdir fluid.app/Contents/MacOS + $(OSX_ONLY) $(RM) -r -f fluid.app + $(OSX_ONLY) mkdir -p fluid.app/Contents/MacOS fluid.app/Contents/Resources $(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS + $(OSX_ONLY) $(INSTALL) icons/fluid.icns fluid.app/Contents/Resources + $(OSX_ONLY) $(INSTALL) fluid.plist fluid.app/Contents/Info.plist fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \ ../src/$(IMGDSONAME) @@ -61,7 +63,7 @@ fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \ clean: -$(RM) *.o core.* *~ *.bck *.bak -$(RM) core fluid$(EXEEXT) fluid-shared$(EXEEXT) - -$(RM) fluid.app/Contents/MacOS/fluid$(EXEEXT) + $(OSX_ONLY) -$(RMDIR) fluid.app depend: $(CPPFILES) makedepend -Y -I.. -f makedepend -w 20 $(CPPFILES) @@ -95,7 +97,6 @@ install-osx: -$(INSTALL_DIR) $(DESTDIR)/Applications/fluid.app -$(INSTALL_DIR) $(DESTDIR)/Applications/fluid.app/Contents $(INSTALL_DATA) fluid.app/Contents/Info.plist $(DESTDIR)/Applications/fluid.app/Contents/Info.plist - $(INSTALL_DATA) fluid.app/Contents/PkgInfo $(DESTDIR)/Applications/fluid.app/Contents/PkgInfo -$(INSTALL_DIR) $(DESTDIR)/Applications/fluid.app/Contents/MacOS $(RM) $(DESTDIR)/Applications/fluid.app/Contents/MacOS/fluid $(LN) $(bindir)/fluid $(DESTDIR)/Applications/fluid.app/Contents/MacOS/fluid diff --git a/fluid/fluid.app/Contents/PkgInfo b/fluid/fluid.app/Contents/PkgInfo deleted file mode 100644 index c5f93635d..000000000 --- a/fluid/fluid.app/Contents/PkgInfo +++ /dev/null @@ -1 +0,0 @@ -FLIDFlid diff --git a/fluid/fluid.app/Contents/Info.plist b/fluid/fluid.plist similarity index 100% rename from fluid/fluid.app/Contents/Info.plist rename to fluid/fluid.plist diff --git a/fluid/fluid.app/Contents/Resources/fluid.icns b/fluid/icons/fluid.icns similarity index 100% rename from fluid/fluid.app/Contents/Resources/fluid.icns rename to fluid/icons/fluid.icns diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 90767d447..d0abbb10d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -67,7 +67,7 @@ CREATE_EXAMPLE (curve curve.cxx fltk) CREATE_EXAMPLE (demo demo.cxx fltk) CREATE_EXAMPLE (device device.cxx fltk) CREATE_EXAMPLE (doublebuffer doublebuffer.cxx fltk) -CREATE_EXAMPLE (editor "editor.cxx;editor-Info.plist" fltk) +CREATE_EXAMPLE (editor "editor.cxx;editor.plist" fltk) CREATE_EXAMPLE (fast_slow fast_slow.fl fltk) CREATE_EXAMPLE (file_chooser file_chooser.cxx "fltk_images;fltk") CREATE_EXAMPLE (fltk-versions fltk-versions.cxx fltk) diff --git a/test/Makefile b/test/Makefile index d514ec8ba..be4974357 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,7 +1,7 @@ # -# Test/example program makefile for the Fast Light Tool Kit (FLTK). +# Test/example program Makefile for the Fast Light Tool Kit (FLTK). # -# Copyright 1998-2020 by Bill Spitzak and others. +# Copyright 1998-2021 by Bill Spitzak and others. # # This library is free software. Distribution and use rights are outlined in # the file "COPYING" which should have been included with this file. If this @@ -196,12 +196,7 @@ include makedepend clean: $(RM) $(ALL) $(GLALL) core - for file in $(ALL) $(GLALL); do \ - if [ $$file = "blocks" -o $$file = "checkers" -o $$file = "sudoku" ]; then \ - continue; \ - fi; \ - $(OSX_ONLY) rm -f -r $$file.app; \ - done + $(RMDIR) *.app $(RM) *.o core.* *~ *.bck *.bak $(RM) CubeViewUI.cxx CubeViewUI.h $(RM) fast_slow.cxx fast_slow.h @@ -214,9 +209,6 @@ clean: $(RM) tabs.cxx tabs.h $(RM) tree.cxx tree.h $(RM) valuators.cxx valuators.h - $(OSX_ONLY) $(RM) blocks.app/Contents/MacOS/blocks$(EXEEXT) - $(OSX_ONLY) $(RM) checkers.app/Contents/MacOS/checkers$(EXEEXT) - $(OSX_ONLY) $(RM) sudoku.app/Contents/MacOS/sudoku$(EXEEXT) install: all echo "Installing example programs to $(DESTDIR)$(docdir)/examples..." @@ -252,7 +244,6 @@ install-osx: $(INSTALL_DIR) $(DESTDIR)/Applications/$$game.app/Contents/Resources; \ fi; \ $(INSTALL_DATA) $$game.app/Contents/Info.plist $(DESTDIR)/Applications/$$game.app/Contents; \ - $(INSTALL_DATA) $$game.app/Contents/PkgInfo $(DESTDIR)/Applications/$$game.app/Contents; \ $(INSTALL_BIN) $$game.app/Contents/MacOS/$$game $(DESTDIR)/Applications/$$game.app/Contents/MacOS; \ $(INSTALL_DATA) $$game.app/Contents/Resources/$$game.icns $(DESTDIR)/Applications/$$game.app/Contents/Resources; \ done @@ -312,16 +303,20 @@ buttons$(EXEEXT): buttons.o blocks$(EXEEXT): blocks.o echo Linking $@... $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK) $(LDLIBS) - $(OSX_ONLY) $(RM) -f -r blocks.app/Contents/MacOS - $(OSX_ONLY) mkdir blocks.app/Contents/MacOS + $(OSX_ONLY) $(RM) -f -r blocks.app + $(OSX_ONLY) mkdir -p blocks.app/Contents/MacOS blocks.app/Contents/Resources $(OSX_ONLY) $(INSTALL_BIN) blocks$(EXEEXT) blocks.app/Contents/MacOS + $(OSX_ONLY) $(INSTALL_BIN) mac-resources/blocks.icns blocks.app/Contents/Resources/ + $(OSX_ONLY) $(INSTALL_BIN) mac-resources/blocks.plist blocks.app/Contents/Info.plist checkers$(EXEEXT): checkers.o echo Linking $@... $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS) - $(OSX_ONLY) $(RM) -f -r checkers.app/Contents/MacOS - $(OSX_ONLY) mkdir checkers.app/Contents/MacOS + $(OSX_ONLY) $(RM) -f -r checkers.app + $(OSX_ONLY) mkdir -p checkers.app/Contents/MacOS checkers.app/Contents/Resources $(OSX_ONLY) $(INSTALL_BIN) checkers$(EXEEXT) checkers.app/Contents/MacOS + $(OSX_ONLY) $(INSTALL_BIN) mac-resources/checkers.icns checkers.app/Contents/Resources/ + $(OSX_ONLY) $(INSTALL_BIN) mac-resources/checkers.plist checkers.app/Contents/Info.plist clock$(EXEEXT): clock.o @@ -356,7 +351,7 @@ editor$(EXEEXT): editor.o echo Linking $@... $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS) $(OSX_ONLY) ../fltk-config --post $@ - $(OSX_ONLY) cp -f editor-Info.plist editor.app/Contents/Info.plist + $(OSX_ONLY) cp -f mac-resources/editor.plist editor.app/Contents/Info.plist fast_slow$(EXEEXT): fast_slow.o fast_slow.cxx: fast_slow.fl ../fluid/fluid$(EXEEXT) @@ -473,9 +468,11 @@ subwindow$(EXEEXT): subwindow.o sudoku: sudoku.o echo Linking $@... $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS) - $(OSX_ONLY) $(RM) -r -f sudoku.app/Contents/MacOS - $(OSX_ONLY) mkdir sudoku.app/Contents/MacOS + $(OSX_ONLY) $(RM) -f -r sudoku.app + $(OSX_ONLY) mkdir -p sudoku.app/Contents/MacOS sudoku.app/Contents/Resources $(OSX_ONLY) $(INSTALL_BIN) sudoku$(EXEEXT) sudoku.app/Contents/MacOS + $(OSX_ONLY) $(INSTALL_BIN) mac-resources/sudoku.icns sudoku.app/Contents/Resources/ + $(OSX_ONLY) $(INSTALL_BIN) mac-resources/sudoku.plist sudoku.app/Contents/Info.plist sudoku.exe: sudoku.o sudoku.rc echo Linking $@... diff --git a/test/blocks.app/Contents/PkgInfo b/test/blocks.app/Contents/PkgInfo deleted file mode 100644 index 103810afb..000000000 --- a/test/blocks.app/Contents/PkgInfo +++ /dev/null @@ -1 +0,0 @@ -BLKSBlks diff --git a/test/checkers.app/Contents/PkgInfo b/test/checkers.app/Contents/PkgInfo deleted file mode 100644 index 5af7226a1..000000000 --- a/test/checkers.app/Contents/PkgInfo +++ /dev/null @@ -1 +0,0 @@ -FLSUFlsu diff --git a/test/blocks.app/Contents/Resources/blocks.icns b/test/mac-resources/blocks.icns similarity index 100% rename from test/blocks.app/Contents/Resources/blocks.icns rename to test/mac-resources/blocks.icns diff --git a/test/blocks.app/Contents/Info.plist b/test/mac-resources/blocks.plist similarity index 88% rename from test/blocks.app/Contents/Info.plist rename to test/mac-resources/blocks.plist index 9448901b6..911e0fc5a 100644 --- a/test/blocks.app/Contents/Info.plist +++ b/test/mac-resources/blocks.plist @@ -17,7 +17,7 @@ English NSHumanReadableCopyright - Copyright 2006 by Michael Sweet + Copyright 2006-2021 by Michael Sweet CFAppleHelpAnchor help @@ -38,7 +38,7 @@ 1.0 CFBundleGetInfoString - 1.0, Copyright 2006 by Michael Sweet + 1.0, Copyright 2006-2021 by Michael Sweet NSHighResolutionCapable diff --git a/test/checkers.app/Contents/Resources/checkers.icns b/test/mac-resources/checkers.icns similarity index 100% rename from test/checkers.app/Contents/Resources/checkers.icns rename to test/mac-resources/checkers.icns diff --git a/test/checkers.app/Contents/Info.plist b/test/mac-resources/checkers.plist similarity index 87% rename from test/checkers.app/Contents/Info.plist rename to test/mac-resources/checkers.plist index 4929602ca..e92595ac8 100644 --- a/test/checkers.app/Contents/Info.plist +++ b/test/mac-resources/checkers.plist @@ -17,7 +17,7 @@ English NSHumanReadableCopyright - Copyright 1997-2010 by Bill Spitzak and others + Copyright 1997-2021 by Bill Spitzak and others CFAppleHelpAnchor help @@ -38,7 +38,7 @@ 1.0 CFBundleGetInfoString - 1.0, Copyright 1997-2010 by Bill Spitzak and others + 1.0, Copyright 1997-2021 by Bill Spitzak and others NSHighResolutionCapable diff --git a/test/editor-Info.plist b/test/mac-resources/editor.plist similarity index 94% rename from test/editor-Info.plist rename to test/mac-resources/editor.plist index dea3f13f5..6324e5cf2 100644 --- a/test/editor-Info.plist +++ b/test/mac-resources/editor.plist @@ -36,7 +36,7 @@ CFBundleVersion 1.0 NSHumanReadableCopyright - Copyright 1998-2010 by Bill Spitzak and others. + Copyright 1998-2021 by Bill Spitzak and others. NSHighResolutionCapable diff --git a/test/sudoku.app/Contents/Resources/sudoku.icns b/test/mac-resources/sudoku.icns similarity index 100% rename from test/sudoku.app/Contents/Resources/sudoku.icns rename to test/mac-resources/sudoku.icns diff --git a/test/sudoku.app/Contents/Info.plist b/test/mac-resources/sudoku.plist similarity index 88% rename from test/sudoku.app/Contents/Info.plist rename to test/mac-resources/sudoku.plist index b75285c37..058382811 100644 --- a/test/sudoku.app/Contents/Info.plist +++ b/test/mac-resources/sudoku.plist @@ -17,7 +17,7 @@ English NSHumanReadableCopyright - Copyright 2005-2006 by Michael Sweet + Copyright 2005-2021 by Michael Sweet CFAppleHelpAnchor help @@ -38,7 +38,7 @@ 1.0 CFBundleGetInfoString - 1.0, Copyright 2005-2006 by Michael Sweet + 1.0, Copyright 2005-2021 by Michael Sweet NSHighResolutionCapable diff --git a/test/sudoku.app/Contents/PkgInfo b/test/sudoku.app/Contents/PkgInfo deleted file mode 100644 index 5af7226a1..000000000 --- a/test/sudoku.app/Contents/PkgInfo +++ /dev/null @@ -1 +0,0 @@ -FLSUFlsu