Modernize the RPM spec.

Breaks Jaskier's MPT player.
https://sourceforge.net/p/asap/bugs/32/

This reverts commit 7a666799ac.

.github/workflows/test.yml

@@ -0,0 +1,16 @@
+name: tests
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      matrix:
+        os: [windows-latest, ubuntu-latest]
+        dc: [dmd-latest, ldc-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@main
+      - uses: dlang-community/setup-dlang@v1
+        with:
+          compiler: ${{ matrix.dc }}
+      - run: dub build
+      - run: dub test

.gitignore

@@ -1,6 +1,10 @@
-xasm
-xasm.exe
-xasm.obj
-xasm.html
-xasm.1
-MANIFEST
+/xasm
+/xasm.exe
+/xasm.obj
+/xasm.html
+/xasm.1
+/xasm-test-*
+/MANIFEST
+/.dub
+/.project
+/signed

Makefile

@@ -1,64 +1,77 @@
-VERSION = 3.1.0
-
-prefix = /usr/local
-bindir = $(prefix)/bin
-mandir = $(prefix)/share/man/man1
-
-SEVENZIP = 7z a -mx=9 -bd
-
-all: xasm xasm.html
-
-xasm: xasm.d
-	dmd -of$@ -O -release $<
-
-xasm.html: xasm.1.txt
-	asciidoc -o - $< | sed -e "s/527bbd;/20a0a0;/" >$@
-
-xasm.1: xasm.1.txt
-	a2x -f manpage $<
-
-install: xasm xasm.1
-	mkdir -p $(DESTDIR)$(bindir) && install xasm $(DESTDIR)$(bindir)/xasm
-	mkdir -p $(DESTDIR)$(mandir) && install -m 644 xasm.1 $(DESTDIR)$(mandir)/xasm.1
-
-uninstall:
-	$(RM) $(DESTDIR)$(bindir)/xasm $(DESTDIR)$(mandir)/xasm.1
-
-install-scite: xasm.properties
-	mkdir -p $(DESTDIR)$(prefix)/share/scite && install $< $(DESTDIR)$(prefix)/share/scite/xasm.properties
-
-uninstall-scite:
-	$(RM) $(DESTDIR)$(prefix)/share/scite/xasm.properties
-
-dist: srcdist ../xasm-$(VERSION)-windows.zip
-
-srcdist: MANIFEST
-	$(RM) ../xasm-$(VERSION).tar.gz && tar -c --numeric-owner --owner=0 --group=0 --mode=644 -T MANIFEST --transform=s,,xasm-$(VERSION)/, | $(SEVENZIP) -tgzip -si ../xasm-$(VERSION).tar.gz
-
-MANIFEST:
-	if test -e .git; then (git ls-files | grep -vF .gitignore && echo MANIFEST) | sort >$@ ; fi
-
-../xasm-$(VERSION)-windows.zip: xasm xasm.html xasm.properties
-	$(RM) $@ && $(SEVENZIP) -tzip $@ xasm.exe xasm.html xasm.properties
-
-deb:
-	debuild -b -us -uc
-
-osx: ../xasm-$(VERSION)-osx.dmg
-
-../xasm-$(VERSION)-osx.dmg: osx/xasm osx/bin
-	hdiutil create -volname xasm-$(VERSION)-osx -srcfolder osx -imagekey zlib-level=9 -ov $@
-
-osx/xasm: xasm.d
-	mkdir -p osx && dmd -of$@ -O -release -m32 -L-macosx_version_min -L10.6 $< && rm -f osx/xasm.o
-
-osx/bin:
-	mkdir -p osx && ln -s /usr/bin $@
-
-clean:
-	$(RM) xasm xasm.exe xasm.obj xasm.html xasm.1
-	rm -rf osx
-
-.PHONY: all install uninstall install-scite uninstall-scite dist srcdist MANIFEST deb osx clean
-
-.DELETE_ON_ERROR:
+VERSION = 3.2.1
+
+prefix = /usr/local
+bindir = $(prefix)/bin
+mandir = $(prefix)/share/man/man1
+ifeq ($(OS),Windows_NT)
+EXEEXT = .exe
+endif
+
+SEVENZIP = 7z a -mx=9 -bd -bso0
+
+all: xasm$(EXEEXT) xasm.html
+
+xasm$(EXEEXT): source/app.d
+	dmd -of$@ -O -release $<
+
+xasm.html: xasm.1.asciidoc
+	asciidoc -o - $< | sed -e "s/527bbd;/20a0a0;/" >$@
+
+xasm.1: xasm.1.asciidoc
+	a2x -f manpage $<
+
+install: xasm xasm.1
+	mkdir -p $(DESTDIR)$(bindir) && install xasm $(DESTDIR)$(bindir)/xasm
+	mkdir -p $(DESTDIR)$(mandir) && install -m 644 xasm.1 $(DESTDIR)$(mandir)/xasm.1
+
+uninstall:
+	$(RM) $(DESTDIR)$(bindir)/xasm $(DESTDIR)$(mandir)/xasm.1
+
+install-scite: xasm.properties
+	mkdir -p $(DESTDIR)$(prefix)/share/scite && install -m 644 $< $(DESTDIR)$(prefix)/share/scite/xasm.properties
+
+uninstall-scite:
+	$(RM) $(DESTDIR)$(prefix)/share/scite/xasm.properties
+
+dist: srcdist ../xasm-$(VERSION)-windows.zip
+
+srcdist: MANIFEST
+	$(RM) ../xasm-$(VERSION).tar.gz && /usr/bin/tar -c --numeric-owner --owner=0 --group=0 --mode=644 -T MANIFEST --transform=s,,xasm-$(VERSION)/, | $(SEVENZIP) -tgzip -si ../xasm-$(VERSION).tar.gz
+
+MANIFEST:
+	if test -e .git; then (git ls-files | grep -vF .gitignore && echo MANIFEST) | sort | dos2unix >$@ ; fi
+
+../xasm-$(VERSION)-windows.zip: xasm.exe xasm.html xasm.properties signed
+	$(RM) $@ && $(SEVENZIP) -tzip $@ xasm.exe xasm.html xasm.properties
+
+signed: xasm$(EXEEXT)
+	signtool sign -d "xasm $(VERSION)" -n "Open Source Developer, Piotr Fusik" -tr http://time.certum.pl -fd sha256 -td sha256 $< && touch $@
+
+deb:
+	debuild -b -us -uc
+
+osx: ../xasm-$(VERSION)-macos.dmg
+
+../xasm-$(VERSION)-macos.dmg: osx/xasm osx/bin
+ifdef PORK_CODESIGNING_IDENTITY
+	codesign --options runtime -f -s $(PORK_CODESIGNING_IDENTITY) osx/xasm
+endif
+	hdiutil create -volname xasm-$(VERSION)-macos -srcfolder osx -format UDBZ -fs HFS+ -imagekey bzip2-level=3 -ov $@
+ifdef PORK_NOTARIZING_CREDENTIALS
+	xcrun altool --notarize-app --primary-bundle-id com.github.pfusik.xasm $(PORK_NOTARIZING_CREDENTIALS) --file $@ \
+		| perl -pe 's/^RequestUUID =/xcrun altool $$ENV{PORK_NOTARIZING_CREDENTIALS} --notarization-info/ or next; $$c = $$_; until (/Status: success/) { sleep 20; $$_ = `$$c`; print; } last;'
+endif
+
+osx/xasm: source/app.d
+	mkdir -p osx && dmd -of$@ -O -release $< && rm -f osx/xasm.o
+
+osx/bin:
+	mkdir -p osx && ln -s /usr/local/bin $@
+
+clean:
+	$(RM) xasm xasm.exe xasm.obj xasm.html xasm.1 signed
+	rm -rf osx
+
+.PHONY: all install uninstall install-scite uninstall-scite dist srcdist MANIFEST deb osx clean
+
+.DELETE_ON_ERROR:

README.md

@@ -1,3 +1,5 @@
+[![GitHub Actions](https://github.com/pfusik/xasm/actions/workflows/test.yml/badge.svg)](https://github.com/pfusik/xasm/actions/workflows/test.yml)
+
 xasm
 ====
 
@@ -8,11 +10,10 @@ for [Atari 8-bit computers](http://en.wikipedia.org/wiki/Atari_8-bit_family).
 Syntax
 ------
 
-6502 assembly language is full of LDA, STA, LDA, STA sequences.
+6502 assembly code is full of LDA, STA, LDA, STA sequences.
 With xasm you can use MVA as a shortcut for an LDA/STA pair or even MWA for 16-bit transfers.
-You can avoid defining labels when you need short jumps,
-thanks to conditional skip and repeat pseudo-instructions.
-You can put two instructions that share their argument in one line.
+Short branches can be replaced with conditional skip and repeat pseudo-instructions.
+You can use a pair of instructions with a shared argument.
 These are just some of the features that help you program in a more concise way.
 Let's look at typical 6502 code (which is also valid in xasm):
 
@@ -45,13 +46,13 @@ Using xasm's features this code can be rewritten to:
     do_line
         ldy     #39
         mva:rpl pattern,y (ptr),y-
-        lda #40
+        lda     #40
         add:sta ptr
         scc:inc ptr+1
         dex:bne do_line
 
-xasm syntax is based on 1990's Quick Assembler.
-Write accumulator shifts as in `asl @`.
+xasm syntax is an extension of Quick Assembler's (created in 1991 for Atari 8-bit).
+Accumulator shifts should be written as in `asl @`.
 Whitespace is important: it is required before the instruction
 and disallowed in the operands, because it separates a comment from the operand, e.g.
 
@@ -78,16 +79,34 @@ For larger projects, I use GNU Make. Press F7 to build (and possibly run)
 a project as described in the `Makefile`. You can find my Makefiles in
 [my repositories](https://github.com/pfusik?tab=repositories) on GitHub.
 
+If you prefer VIM, see a link below.
+
+Poetic License
+--------------
+
+This work 'as-is' we provide.  
+No warranty express or implied.  
+We've done our best,  
+to debug and test.  
+Liability for damages denied.
+
+Permission is granted hereby,  
+to copy, share, and modify.  
+Use as is fit,  
+free or for profit.  
+These rights, on this notice, rely.  
+
 Download
 --------
 
-[xasm 3.1.0](https://github.com/pfusik/xasm/releases) for Windows, OS X, Ubuntu and Fedora.
+[xasm 3.2.1](https://github.com/pfusik/xasm/releases) for Windows, macOS, Ubuntu and Fedora.
 
 Links
 -----
 
-* [Atari800](http://atari800.sourceforge.net/) - portable emulator of Atari 8-bit computers
+* [Atari800](https://atari800.github.io/) - portable emulator of Atari 8-bit computers
 * [Atari XL/XE Source Archive](http://sources.pigwa.net/) - source code of Atari demos, utilities and games
-* [cc65](http://cc65.github.io/cc65/) - C cross-compiler targeting 6502-based systems
+* [cc65](https://cc65.github.io/) - C cross-compiler targeting 6502-based systems
 * [MADS](http://mads.atari8.info/) - another 6502/65816 cross-assembler, partially supporting xasm's syntax
-* [WUDSN IDE](http://wudsn.com/) - Eclipse plugin, front-end to several 6502 cross-assemblers including xasm
+* [vim-xasm](https://github.com/lybrown/vim-xasm) - VIM syntax highlighting for xasm
+* [WUDSN IDE](http://wudsn.com/) - Eclipse plugin, front-end to several 6502 cross-assemblers, including xasm

debian/changelog

@@ -1,3 +1,21 @@
+xasm (3.2.1-1) UNRELEASED; urgency=low
+
+  * New release.
+
+ -- Piotr Fusik <fox@scene.pl>  Thu, 8 Dec 2022 09:30:29 +0100
+
+xasm (3.2.0-1) UNRELEASED; urgency=low
+
+  * New release.
+
+ -- Piotr Fusik <fox@scene.pl>  Tue, 22 Jun 2021 20:59:45 +0200
+
+xasm (3.1.1-1) UNRELEASED; urgency=low
+
+  * New release.
+
+ -- Piotr Fusik <fox@scene.pl>  Wed, 20 Nov 2019 13:30:11 +0100
+
 xasm (3.1.0-1) UNRELEASED; urgency=low
 
   * First deb packaging.

debian/compat

@@ -1 +1 @@
-9
+10

debian/control

@@ -2,13 +2,13 @@ Source: xasm
 Maintainer: Piotr Fusik <fox@scene.pl>
 Section: devel
 Priority: optional
-Standards-Version: 3.9.3
-Build-Depends: debhelper (>= 7), dmd (>= 2), asciidoc
+Standards-Version: 4.6.0
+Build-Depends: debhelper (>= 7), dmd (>= 2), asciidoc-base
 
 Package: xasm
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: A 6502 cross-assembler with original syntax extensions.
+Description: 6502 cross-assembler with original syntax extensions.
 
 Package: xasm-scite
 Architecture: all

debian/copyright

@@ -1,7 +1,7 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Name: xasm
 Source: https://github.com/pfusik/xasm
 
 Files: *
-Copyright: 1998-2014 Piotr Fusik <fox@scene.pl>
+Copyright: 1998-2021 Piotr Fusik <fox@scene.pl>
 License: Poetic

dub.sdl

@@ -0,0 +1,5 @@
+name "xasm"
+description "6502 cross-assembler with original syntax extensions"
+authors "Piotr Fusik"
+copyright "Copyright © 1998-2021, Piotr Fusik"
+license "poetic"

xasm.properties

@@ -1,40 +1,42 @@
-# xasm settings for SciTE (http://www.scintilla.org/SciTE.html)
-
-file.patterns.asx=*.asx
-filter.asx=xasm (asx)|$(file.patterns.asm)|
-lexer.$(file.patterns.asx)=asm
-
-keywords.$(file.patterns.asx)= \
-	adc add and asl bcc bcs beq bit \
-	bmi bne bpl brk bvc bvs clc cld \
-	cli clv cmp cpx cpy dec dex dey \
-	dta eif eli els end eor equ ert \
-	icl ift inc ini ins inw inx iny \
-	jcc jcs jeq jmi jmp jne jpl jsr \
-	jvc jvs lda ldx ldy lsr mva mvx \
-	mvy mwa mwx mwy nop opt ora org \
-	pha php pla plp rcc rcs req rmi \
-	rne rol ror rpl rti rts run rvc \
-	rvs sbc scc scs sec sed sei seq \
-	smi sne spl sta stx sty sub svc \
-	svs tax tay tsx txa txs tya
-
-comment.block.asm=;
-
-style.asm.32=
-style.asm.1=$(colour.code.comment.line)
-style.asm.2=
-style.asm.3=$(colour.string)
-style.asm.4=$(colour.operator)
-style.asm.5=
-style.asm.6=$(colour.keyword)
-style.asm.7=
-style.asm.12=$(colour.char)
-style.asm.13=$(colour.error)
-
-command.compile.$(file.patterns.asx)=xasm /o:$(FileName).xex $(FilePath)
-command.build.$(file.patterns.asx)=make
-if PLAT_WIN
-	command.go.$(file.patterns.asx)=start $(FileName).xex
-if PLAT_GTK
-	command.go.$(file.patterns.asx)=atari800 -run $(FileName).xex
+# xasm settings for SciTE (http://www.scintilla.org/SciTE.html)
+
+file.patterns.xasm=*.asx
+filter.xasm=xasm (asx)|$(file.patterns.xasm)|
+*filter.xasm=$(filter.xasm)
+lexer.$(file.patterns.xasm)=asm
+*language.xasm=xasm|asx||
+
+keywords.$(file.patterns.xasm)= \
+	adc add and asl bcc bcs beq bit \
+	bmi bne bpl brk bvc bvs clc cld \
+	cli clv cmp cpx cpy dec dex dey \
+	dta eif eli els end eor equ ert \
+	icl ift inc ini ins inw inx iny \
+	jcc jcs jeq jmi jmp jne jpl jsr \
+	jvc jvs lda ldx ldy lsr mva mvx \
+	mvy mwa mwx mwy nop opt ora org \
+	pha php pla plp rcc rcs req rmi \
+	rne rol ror rpl rti rts run rvc \
+	rvs sbc scc scs sec sed sei seq \
+	smi sne spl sta stx sty sub svc \
+	svs tax tay tsx txa txs tya
+
+comment.block.asm=;
+
+style.asm.32=
+style.asm.1=$(colour.code.comment.line)
+style.asm.2=
+style.asm.3=$(colour.string)
+style.asm.4=$(colour.operator)
+style.asm.5=
+style.asm.6=$(colour.keyword)
+style.asm.7=
+style.asm.12=$(colour.char)
+style.asm.13=$(colour.error)
+
+command.compile.$(file.patterns.xasm)=xasm /o:$(FileName).xex $(FilePath)
+command.build.$(file.patterns.xasm)=make
+if PLAT_WIN
+	command.go.$(file.patterns.xasm)=start $(FileName).xex
+if PLAT_GTK
+	command.go.$(file.patterns.xasm)=atari800 -run $(FileName).xex

xasm.spec

@@ -1,17 +1,17 @@
 Name: xasm
-Version: 3.1.0
+Version: 3.2.1
 Release: 1
 Summary: 6502 cross-assembler
 License: Poetic
-Group: Applications/Programming
 Source: http://pfusik.github.io/xasm/xasm-%{version}.tar.gz
 URL: https://github.com/pfusik/xasm
 BuildRequires: dmd >= 2, asciidoc
-BuildRoot: %{_tmppath}/%{name}-root
 
 %description
 xasm is a 6502 cross-assembler with original syntax extensions.
 
+%global debug_package %{nil}
+
 %prep
 %setup -q
 
@@ -19,18 +19,22 @@ xasm is a 6502 cross-assembler with original syntax extensions.
 make xasm xasm.1
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make DESTDIR=%{buildroot} prefix=%{_prefix} install
 
 %files
-%defattr(-,root,root)
 %{_bindir}/xasm
 %{_mandir}/man1/xasm.1.gz
 
 %changelog
+* Thu Dec 8 2022 Piotr Fusik <fox@scene.pl>
+- 3.2.1-1
+
+* Tue Jun 22 2021 Piotr Fusik <fox@scene.pl>
+- 3.2.0-1
+
+* Wed Nov 20 2019 Piotr Fusik <fox@scene.pl>
+- 3.1.1-1
+
 * Sun Jul 20 2014 Piotr Fusik <fox@scene.pl>
 - 3.1.0-1
 - Initial packaging