summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/.gitignore84
-rw-r--r--test/CMakeLists.txt8
-rw-r--r--test/Makefile57
-rw-r--r--test/blocks.app/Contents/PkgInfo1
-rw-r--r--test/checkers.app/Contents/PkgInfo1
-rw-r--r--test/mac-resources/blocks.icns (renamed from test/blocks.app/Contents/Resources/blocks.icns)bin51049 -> 51049 bytes
-rw-r--r--test/mac-resources/blocks.plist (renamed from test/blocks.app/Contents/Info.plist)6
-rw-r--r--test/mac-resources/checkers.icns (renamed from test/checkers.app/Contents/Resources/checkers.icns)bin61235 -> 61235 bytes
-rw-r--r--test/mac-resources/checkers.plist (renamed from test/checkers.app/Contents/Info.plist)6
-rw-r--r--test/mac-resources/editor.plist (renamed from test/editor-Info.plist)2
-rw-r--r--test/mac-resources/sudoku.icns (renamed from test/sudoku.app/Contents/Resources/sudoku.icns)bin34921 -> 34921 bytes
-rw-r--r--test/mac-resources/sudoku.plist (renamed from test/sudoku.app/Contents/Info.plist)4
-rw-r--r--test/sudoku.app/Contents/PkgInfo1
13 files changed, 31 insertions, 139 deletions
diff --git a/test/.gitignore b/test/.gitignore
index cb9e85b0d..e11a9a2ca 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -132,86 +132,4 @@ windowfocus
# macOS binary files
-# (a) bundles *partially* in Git: ignore executables only
-
-blocks.app/Contents/MacOS/blocks
-checkers.app/Contents/MacOS/checkers
-sudoku.app/Contents/MacOS/sudoku
-
-# (b) other bundles created by in-source builds
-
-adjuster.app
-animated.app
-arc.app
-ask.app
-bitmap.app
-boxtype.app
-browser.app
-button.app
-buttons.app
-cairo_test.app
-clock.app
-colbrowser.app
-color_chooser.app
-cube.app
-CubeView.app
-cursor.app
-curve.app
-demo.app
-device.app
-doublebuffer.app
-editor.app
-fast_slow.app
-file_chooser.app
-fonts.app
-forms.app
-fractals.app
-fullscreen.app
-gl_overlay.app
-glpuzzle.app
-hello.app
-help_dialog.app
-icon.app
-iconize.app
-image.app
-inactive.app
-input.app
-input_choice.app
-keyboard.app
-label.app
-line_style.app
-list_visuals.app
-mandelbrot.app
-menubar.app
-message.app
-minimum.app
-native-filechooser.app
-navigation.app
-offscreen.app
-output.app
-overlay.app
-pack.app
-pixmap.app
-pixmap_browser.app
-preferences.app
-radio.app
-resize.app
-resize-example*.app
-resizebox.app
-rotated_text.app
-scroll.app
-shape.app
-subwindow.app
-symbols.app
-table.app
-tabs.app
-tabs.app/Contents
-threads.app
-tile.app
-tiled_image.app
-tree.app
-twowin.app
-unittests.app
-utf8.app
-valuators.app
-windowfocus.app
+*.app
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7341de886..9c602ce7a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,7 +1,7 @@
#
# CMakeLists.txt used to build test and demo apps by the CMake build system
#
-# Copyright 2004-2020 by Bill Spitzak and others.
+# Copyright 2004-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
@@ -57,7 +57,7 @@ CREATE_EXAMPLE (arc arc.cxx fltk ANDROID_OK)
CREATE_EXAMPLE (animated animated.cxx fltk ANDROID_OK)
CREATE_EXAMPLE (ask ask.cxx fltk ANDROID_OK)
CREATE_EXAMPLE (bitmap bitmap.cxx fltk ANDROID_OK)
-CREATE_EXAMPLE (blocks "blocks.cxx;blocks.icns" "fltk;${AUDIOLIBS}")
+CREATE_EXAMPLE (blocks "blocks.cxx;blocks.plist;blocks.icns" "fltk;${AUDIOLIBS}")
CREATE_EXAMPLE (boxtype boxtype.cxx fltk ANDROID_OK)
CREATE_EXAMPLE (browser browser.cxx fltk ANDROID_OK)
CREATE_EXAMPLE (button button.cxx fltk ANDROID_OK)
@@ -71,7 +71,7 @@ CREATE_EXAMPLE (curve curve.cxx fltk ANDROID_OK)
CREATE_EXAMPLE (demo demo.cxx fltk)
CREATE_EXAMPLE (device device.cxx "fltk_images;fltk")
CREATE_EXAMPLE (doublebuffer doublebuffer.cxx fltk ANDROID_OK)
-CREATE_EXAMPLE (editor "editor.cxx;editor-Info.plist" fltk ANDROID_OK)
+CREATE_EXAMPLE (editor "editor.cxx;editor.plist" fltk ANDROID_OK)
CREATE_EXAMPLE (fast_slow fast_slow.fl fltk ANDROID_OK)
CREATE_EXAMPLE (file_chooser file_chooser.cxx "fltk_images;fltk")
CREATE_EXAMPLE (fltk-versions fltk-versions.cxx fltk)
@@ -120,7 +120,7 @@ CREATE_EXAMPLE (resize-example4b "resize-example4b.cxx;resize-arrows.cxx" fltk)
CREATE_EXAMPLE (rotated_text rotated_text.cxx fltk)
CREATE_EXAMPLE (scroll scroll.cxx fltk)
CREATE_EXAMPLE (subwindow subwindow.cxx fltk)
-CREATE_EXAMPLE (sudoku "sudoku.cxx;sudoku.icns;sudoku.rc" "fltk_images;fltk;${AUDIOLIBS}")
+CREATE_EXAMPLE (sudoku "sudoku.cxx;sudoku.plist;sudoku.icns;sudoku.rc" "fltk_images;fltk;${AUDIOLIBS}")
CREATE_EXAMPLE (symbols symbols.cxx fltk)
CREATE_EXAMPLE (tabs tabs.fl fltk)
CREATE_EXAMPLE (table table.cxx fltk)
diff --git a/test/Makefile b/test/Makefile
index b3f213119..e7f71af46 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
@@ -208,35 +208,9 @@ depend: $(CPPFILES)
# Automatically generated dependencies...
include makedepend
-# Additional dependencies...
-cairo_test.o: ../FL/Fl_Bitmap.H
-cairo_test.o: ../FL/Fl_Box.H
-cairo_test.o: ../FL/Fl_Cairo_Window.H
-cairo_test.o: ../FL/Fl_Device.H
-cairo_test.o: ../FL/Fl_Double_Window.H
-cairo_test.o: ../FL/fl_draw.H
-cairo_test.o: ../FL/Fl_Graphics_Driver.H
-cairo_test.o: ../FL/Fl_Group.H
-cairo_test.o: ../FL/Fl.H
-cairo_test.o: ../FL/Fl_Image.H
-cairo_test.o: ../FL/Fl_Pixmap.H
-cairo_test.o: ../FL/Fl_Plugin.H
-cairo_test.o: ../FL/Fl_Preferences.H
-cairo_test.o: ../FL/Fl_RGB_Image.H
-cairo_test.o: ../FL/fl_utf8.h
-cairo_test.o: ../FL/Fl_Widget.H
-cairo_test.o: ../FL/Fl_Window.H
-cairo_test.o: ../FL/math.h
-cairo_test.o: ../FL/platform.H
-
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) checkers_pieces.cxx checkers_pieces.h
@@ -250,9 +224,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..."
@@ -288,7 +259,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
@@ -348,16 +318,21 @@ 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 checkers_pieces.o
echo Linking $@...
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o checkers_pieces.o -o $@ $(LINKFLTKIMG) $(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
+
checkers.cxx: checkers_pieces.h
checkers_pieces.o: checkers_pieces.h
checkers_pieces.h: checkers_pieces.fl
@@ -396,7 +371,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)
@@ -548,9 +523,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
index 7e7ba24eb..7e7ba24eb 100644
--- a/test/blocks.app/Contents/Resources/blocks.icns
+++ b/test/mac-resources/blocks.icns
Binary files differ
diff --git a/test/blocks.app/Contents/Info.plist b/test/mac-resources/blocks.plist
index 9448901b6..bb256be62 100644
--- a/test/blocks.app/Contents/Info.plist
+++ b/test/mac-resources/blocks.plist
@@ -8,7 +8,7 @@
<string>blocks</string>
<key>CFBundleIdentifier</key>
- <string>com.easysw.blocks</string>
+ <string>org.fltk.blocks</string>
<key>CFBundleVersion</key>
<string>1.0</string>
@@ -17,7 +17,7 @@
<string>English</string>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 2006 by Michael Sweet</string>
+ <string>Copyright 2006-2021 by Michael Sweet</string>
<key>CFAppleHelpAnchor</key>
<string>help</string>
@@ -38,7 +38,7 @@
<string>1.0</string>
<key>CFBundleGetInfoString</key>
- <string>1.0, Copyright 2006 by Michael Sweet</string>
+ <string>1.0, Copyright 2006-2021 by Michael Sweet</string>
<key>NSHighResolutionCapable</key>
<true/>
diff --git a/test/checkers.app/Contents/Resources/checkers.icns b/test/mac-resources/checkers.icns
index 5bdec121c..5bdec121c 100644
--- a/test/checkers.app/Contents/Resources/checkers.icns
+++ b/test/mac-resources/checkers.icns
Binary files differ
diff --git a/test/checkers.app/Contents/Info.plist b/test/mac-resources/checkers.plist
index 4929602ca..66ec8d1e9 100644
--- a/test/checkers.app/Contents/Info.plist
+++ b/test/mac-resources/checkers.plist
@@ -17,7 +17,7 @@
<string>English</string>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 1997-2010 by Bill Spitzak and others</string>
+ <string>Copyright 1997-2021 by Bill Spitzak and others</string>
<key>CFAppleHelpAnchor</key>
<string>help</string>
@@ -29,7 +29,7 @@
<string>APPL</string>
<key>CFBundleSignature</key>
- <string>FLSU</string>
+ <string>FLCK</string>
<key>CFBundleIconFile</key>
<string>checkers.icns</string>
@@ -38,7 +38,7 @@
<string>1.0</string>
<key>CFBundleGetInfoString</key>
- <string>1.0, Copyright 1997-2010 by Bill Spitzak and others</string>
+ <string>1.0, Copyright 1997-2021 by Bill Spitzak and others</string>
<key>NSHighResolutionCapable</key>
<true/>
diff --git a/test/editor-Info.plist b/test/mac-resources/editor.plist
index dea3f13f5..6324e5cf2 100644
--- a/test/editor-Info.plist
+++ b/test/mac-resources/editor.plist
@@ -36,7 +36,7 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 1998-2010 by Bill Spitzak and others.</string>
+ <string>Copyright 1998-2021 by Bill Spitzak and others.</string>
<key>NSHighResolutionCapable</key>
<true/>
</dict>
diff --git a/test/sudoku.app/Contents/Resources/sudoku.icns b/test/mac-resources/sudoku.icns
index abbe75ef0..abbe75ef0 100644
--- a/test/sudoku.app/Contents/Resources/sudoku.icns
+++ b/test/mac-resources/sudoku.icns
Binary files differ
diff --git a/test/sudoku.app/Contents/Info.plist b/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 @@
<string>English</string>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 2005-2006 by Michael Sweet</string>
+ <string>Copyright 2005-2021 by Michael Sweet</string>
<key>CFAppleHelpAnchor</key>
<string>help</string>
@@ -38,7 +38,7 @@
<string>1.0</string>
<key>CFBundleGetInfoString</key>
- <string>1.0, Copyright 2005-2006 by Michael Sweet</string>
+ <string>1.0, Copyright 2005-2021 by Michael Sweet</string>
<key>NSHighResolutionCapable</key>
<true/>
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
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-09 02:04:57 +0000