Use xgterm and ximtool icons provided upstream

iraf-community · Aug 18, 2024 · f97110c · f97110c
1 parent 7c9e56a
commit f97110c
Show file tree

Hide file tree

Showing 29 changed files with 25 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -33,6 +33,10 @@ jobs:
           sudo installer -package /Volumes/XQuartz-2.8.1/XQuartz.pkg -target /
           sudo rm -f /usr/local/include/tcl.h
 
+      - name: Setup required build tools from brew (ImageMagic for the moment)
+        run: |
+          brew install imagemagick
+          
       - name: Build package
         run: |
            make -j 4

diff --git a/Makefile b/Makefile
@@ -74,9 +74,18 @@ ximtool.pkg: core.pkg
 	install -m755 $(BUILDDIR)/x11iraf/ximtool/clients/ism_wcspix.e \
 	        $(INSTDIR)/ximtool/XImtool.app/Contents/Resources/bin
 	install ximtool/Info.plist $(INSTDIR)/ximtool/XImtool.app/Contents/Info.plist
+	mkdir $(BUILDDIR)/x11iraf/ximtool/XImtool.iconset
+	for sz in 16 32 64 128 256 512 1024; do \
+	    magick $(BUILDDIR)/x11iraf/ximtool/XImtool.xcf -background transparent -flatten \
+	      -bordercolor transparent -border 5% -scale $${sz}x$${sz} \
+	      $(BUILDDIR)/x11iraf/ximtool/XImtool.iconset/icon_$${sz}x$${sz}.png ; \
+	    sz2=$$(expr $${sz} / 2) \
+	    cp $(BUILDDIR)/x11iraf/ximtool/XImtool.iconset/icon_$${sz}x$${sz}.png \
+	       $(BUILDDIR)/x11iraf/ximtool/XImtool.iconset/icon_$${sz2}x$${sz2}@2x.png ; \
+	done
 	iconutil --convert icns \
 	         --output $(INSTDIR)/ximtool/XImtool.app/Contents/Resources/XImtool.icns \
-	         ximtool/XImtool.iconset/
+	         $(BUILDDIR)/x11iraf/ximtool/XImtool.iconset/
 	install $(BUILDDIR)/x11iraf/ximtool/ximtool.man \
 	        $(INSTDIR)/ximtool/XImtool.app/Contents/Resources/man/ximtool.1
 	codesign -s - -i community.iraf.ximtool $(INSTDIR)/ximtool/XImtool.app
@@ -97,9 +106,18 @@ xgterm.pkg: ximtool.pkg # This re-uses the same build as ximtool
 	        $(INSTDIR)/xgterm/XGTerm.app/Contents/Resources/bin
 	install -m755 xgterm/XGTerm $(INSTDIR)/xgterm/XGTerm.app/Contents/MacOS
 	install xgterm/Info.plist $(INSTDIR)/xgterm/XGTerm.app/Contents/Info.plist
+	mkdir $(BUILDDIR)/x11iraf/xgterm/XGTerm.iconset
+	for sz in 16 32 64 128 256 512 1024; do \
+	    magick $(BUILDDIR)/x11iraf/xgterm/XGTerm.xcf -background transparent -flatten \
+	      -bordercolor transparent -border 5% -scale $${sz}x$${sz} \
+	      $(BUILDDIR)/x11iraf/xgterm/XGTerm.iconset/icon_$${sz}x$${sz}.png ; \
+	    sz2=$$(expr $${sz} / 2) ; \
+	    cp $(BUILDDIR)/x11iraf/xgterm/XGTerm.iconset/icon_$${sz}x$${sz}.png \
+	       $(BUILDDIR)/x11iraf/xgterm/XGTerm.iconset/icon_$${sz2}x$${sz2}@2x.png ; \
+	done
 	iconutil --convert icns \
 	         --output $(INSTDIR)/xgterm/XGTerm.app/Contents/Resources/XGTerm.icns \
-	         xgterm/XGTerm.iconset/
+	         $(BUILDDIR)/x11iraf/xgterm/XGTerm.iconset/
 	install $(BUILDDIR)/x11iraf/xgterm/xgterm.man \
 	        $(INSTDIR)/xgterm/XGTerm.app/Contents/Resources/man/xgterm.1
 	tic -v -o $(INSTDIR)/xgterm/XGTerm.app/Contents/Resources/terminfo \

diff --git a/README.md b/README.md
@@ -26,6 +26,7 @@ macOS](https://iraf-community.github.io/install.html#macos) web page.
 
 * install XCode tools (`xcode-select --install`)
 * install [XQuartz](https://www.xquartz.org/)
+* install ImageMagick from Brew (`brew install imagemagick`)
 * run 
    - `make` to build the host arch, 
    - `make MACARCH=x86_64` to build Intel/64bit installer on Apple Silicon

diff --git a/xgterm/XGTerm.iconset/icon_128x128.png b/xgterm/XGTerm.iconset/icon_128x128.png
diff --git a/xgterm/XGTerm.iconset/[email protected] b/xgterm/XGTerm.iconset/[email protected]
diff --git a/xgterm/XGTerm.iconset/icon_16x16.png b/xgterm/XGTerm.iconset/icon_16x16.png
diff --git a/xgterm/XGTerm.iconset/[email protected] b/xgterm/XGTerm.iconset/[email protected]
diff --git a/xgterm/XGTerm.iconset/icon_256x256.png b/xgterm/XGTerm.iconset/icon_256x256.png
diff --git a/xgterm/XGTerm.iconset/[email protected] b/xgterm/XGTerm.iconset/[email protected]
diff --git a/xgterm/XGTerm.iconset/icon_32x32.png b/xgterm/XGTerm.iconset/icon_32x32.png
diff --git a/xgterm/XGTerm.iconset/[email protected] b/xgterm/XGTerm.iconset/[email protected]
diff --git a/xgterm/XGTerm.iconset/icon_512x512.png b/xgterm/XGTerm.iconset/icon_512x512.png
diff --git a/xgterm/XGTerm.iconset/[email protected] b/xgterm/XGTerm.iconset/[email protected]
diff --git a/xgterm/XGTerm.iconset/icon_64x64.png b/xgterm/XGTerm.iconset/icon_64x64.png
diff --git a/xgterm/XGTerm.iconset/[email protected] b/xgterm/XGTerm.iconset/[email protected]
diff --git a/xgterm/XGTerm.xcf b/xgterm/XGTerm.xcf
diff --git a/ximtool/XImtool.iconset/icon_128x128.png b/ximtool/XImtool.iconset/icon_128x128.png
diff --git a/ximtool/XImtool.iconset/[email protected] b/ximtool/XImtool.iconset/[email protected]
diff --git a/ximtool/XImtool.iconset/icon_16x16.png b/ximtool/XImtool.iconset/icon_16x16.png
diff --git a/ximtool/XImtool.iconset/[email protected] b/ximtool/XImtool.iconset/[email protected]
diff --git a/ximtool/XImtool.iconset/icon_256x256.png b/ximtool/XImtool.iconset/icon_256x256.png
diff --git a/ximtool/XImtool.iconset/[email protected] b/ximtool/XImtool.iconset/[email protected]
diff --git a/ximtool/XImtool.iconset/icon_32x32.png b/ximtool/XImtool.iconset/icon_32x32.png
diff --git a/ximtool/XImtool.iconset/[email protected] b/ximtool/XImtool.iconset/[email protected]
diff --git a/ximtool/XImtool.iconset/icon_512x512.png b/ximtool/XImtool.iconset/icon_512x512.png
diff --git a/ximtool/XImtool.iconset/[email protected] b/ximtool/XImtool.iconset/[email protected]
diff --git a/ximtool/XImtool.iconset/icon_64x64.png b/ximtool/XImtool.iconset/icon_64x64.png
diff --git a/ximtool/XImtool.iconset/[email protected] b/ximtool/XImtool.iconset/[email protected]
diff --git a/ximtool/XImtool.xcf b/ximtool/XImtool.xcf