From 84ac5f52efc9bc13fd1d3bd18991b1667aaf0413 Mon Sep 17 00:00:00 2001 From: Sebastiano Tronto Date: Sun, 13 Feb 2022 13:57:27 +0100 Subject: Small makefile changes, fixed todo list --- Makefile | 16 ++++++---------- TODO.md | 5 ++--- doc/nissy.html | 18 ++++++++---------- doc/nissy.pdf | Bin 33153 -> 33152 bytes nissy | Bin 322488 -> 0 bytes nissy.exe | Bin 788662 -> 0 bytes 6 files changed, 16 insertions(+), 23 deletions(-) delete mode 100755 nissy delete mode 100755 nissy.exe diff --git a/Makefile b/Makefile index 7ffd642..a167d5a 100644 --- a/Makefile +++ b/Makefile @@ -14,26 +14,21 @@ DBGFLAGS = -std=c99 -pthread -pedantic -Wall -Wextra \ CC = cc -all: options nissy - -options: - @echo nissy build options: - @echo "CFLAGS = ${CFLAGS}" - @echo "CC = ${CC}" +all: nissy nissy: ${CC} ${CFLAGS} -o nissy src/*.c -win: +nissy.exe: x86_64-w64-mingw32-gcc ${CFLAGS} -static -o nissy.exe src/*.c debug: ${CC} ${DBGFLAGS} -o nissy src/*.c clean: - rm -rf nissy nissy-*.tar.gz + rm -rf nissy nissy*.exe nissy*.tar.gz -dist: clean +dist: clean nissy.exe mkdir -p nissy-${VERSION} cp -R LICENSE Makefile INSTALL doc src nissy-${VERSION} groff -Tpdf -mandoc doc/nissy.1 > doc/nissy.pdf @@ -43,6 +38,7 @@ dist: clean tar -cf nissy-${VERSION}.tar nissy-${VERSION} gzip nissy-${VERSION}.tar rm -rf nissy-${VERSION} + mv nissy.exe nissy-${VERSION}.exe install: nissy mkdir -p ${DESTDIR}${PREFIX}/bin @@ -57,5 +53,5 @@ uninstall: rm -rf ${DESTDIR}${PREFIX}/bin/nissy ${DESTDIR}${MANPREFIX}/man1/nissy.1 for s in ${SCRIPTS}; do rm -rf ${DESTDIR}${PREFIX}/bin/$$s; done -.PHONY: all options win debug clean dist install uninstall +.PHONY: all debug clean dist install uninstall diff --git a/TODO.md b/TODO.md index b321a92..f043841 100644 --- a/TODO.md +++ b/TODO.md @@ -4,9 +4,6 @@ This is a list of things that I would like to add or change at some point. It's more of a personal reminder than anything else. ## For version 2.1 -### Bugs -* when reading scramble, unmatched ( does not produce any error, unmatched ) -produces TWO errors but it goes on anyway ### Scrambles * Better two-phase solver, make sure to not have cancelling moves (possibly use cleanup function) @@ -23,6 +20,8 @@ produces TWO errors but it goes on anyway ### More * Anything quick and easy from the sections below * fix LICENSE file +* Download page at nissy.tronto.net, upload every dist version there + (and then always run make clean before git push) ## Commands diff --git a/doc/nissy.html b/doc/nissy.html index e51aa07..ed73e37 100644 --- a/doc/nissy.html +++ b/doc/nissy.html @@ -1,5 +1,5 @@ - + @@ -29,10 +29,9 @@ Rubik’s cube solver and FMC assistant

SYNOPSIS

-

[−b]

- -

nissy command -[options...]

+

nissy [−b] +
+nissy command [options...]

DESCRIPTION

@@ -181,11 +180,10 @@ solutions that require the minimum number of moves.

Only find solutions that require at most N moves more than the -optimal solution. If N is 0, this is equivalent -to

+optimal solution. If N is 0, this is equivalent to +−o

-

−o
-−p

+

−p

Plain style: do not print the number of moves.

@@ -310,7 +308,7 @@ D' F R' D B L2 B R2 L U L U2 B D' U R U F2 (18)

https://github.com/sebastianotronto/nissy

BSD -December 29, 2021 BSD

+February 13, 2022 BSD

diff --git a/doc/nissy.pdf b/doc/nissy.pdf index fa71758..be8433e 100644 Binary files a/doc/nissy.pdf and b/doc/nissy.pdf differ diff --git a/nissy b/nissy deleted file mode 100755 index c70e746..0000000 Binary files a/nissy and /dev/null differ diff --git a/nissy.exe b/nissy.exe deleted file mode 100755 index 74d0607..0000000 Binary files a/nissy.exe and /dev/null differ -- cgit v1.3