Small makefile changes, fixed todo list

author: Sebastiano Tronto <sebastiano@tronto.net> 2022-02-13 13:57:27 +0100
committer: Sebastiano Tronto <sebastiano@tronto.net> 2022-02-13 13:57:27 +0100
commit: 84ac5f52efc9bc13fd1d3bd18991b1667aaf0413 (patch)
tree: 3256a711dbb8690cda8ce670196ecaa7eb689a52
parent: 97c9dba402d6d4097cbdc4c44c00222c53122033 (diff)
download: nissy-84ac5f52efc9bc13fd1d3bd18991b1667aaf0413.tar.gz
nissy-84ac5f52efc9bc13fd1d3bd18991b1667aaf0413.zip
6 files changed, 16 insertions, 23 deletions
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
+all: nissy
-options:
-        @echo nissy build options:
-        @echo "CFLAGS   = ${CFLAGS}"
-        @echo "CC       = ${CC}"
 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 @@
 <!-- Creator     : groff version 1.22.4 -->
-<!-- CreationDate: Wed Dec 29 17:47:39 2021 -->
+<!-- CreationDate: Sun Feb 13 13:56:11 2022 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
@@ -29,10 +29,9 @@ Rubik&rsquo;s cube solver and FMC assistant</p>
 <p style="margin-top: 1em"><b>SYNOPSIS</b></p>
-<p style="margin-left:6%;">[<b>&minus;b</b>]</p>
+<p style="margin-left:14%;"><b>nissy</b> [<b>&minus;b</b>]
+<b><br>
-<p style="margin-left:14%;"><b>nissy</b> <i>command</i>
+nissy</b> <i>command</i> [options...]</p>
-[options...]</p>
 <p style="margin-top: 1em"><b>DESCRIPTION</b></p>
@@ -181,11 +180,10 @@ solutions that require the minimum number of moves.</p>
 <p style="margin-left:27%; margin-top: 1em">Only find
 solutions that require at most <i>N</i> moves more than the
-optimal solution. If <i>N</i> is 0, this is equivalent
+optimal solution. If <i>N</i> is 0, this is equivalent to
-to</p>
+<b>&minus;o</b></p>
-<p style="margin-top: 1em"><b>&minus;o <br>
+<p style="margin-top: 1em"><b>&minus;p</b></p>
-&minus;p</b></p>
 <p style="margin-left:27%; margin-top: 1em">Plain style: do
 not print the number of moves.</p>
@@ -310,7 +308,7 @@ D' F R' D B L2 B R2 L U L U2 B D' U R U F2 (18)</p>
 <b>https://github.com/sebastianotronto/nissy</b></p>
 <p style="margin-left:6%; margin-top: 1em">BSD
-December&nbsp;29, 2021 BSD</p>
+February&nbsp;13, 2022 BSD</p>
 <hr>
 </body>
 </html>
diff --git a/doc/nissy.pdf b/doc/nissy.pdf
index fa71758..be8433e 100644
--- a/doc/nissy.pdf
+++ b/doc/nissy.pdf
Binary files differ
diff --git a/nissy b/nissy
deleted file mode 100755
index c70e746..0000000
--- a/nissy
+++ /dev/null
Binary files differ
diff --git a/nissy.exe b/nissy.exe
deleted file mode 100755
index 74d0607..0000000
--- a/nissy.exe
+++ /dev/null
Binary files differ
author	Sebastiano Tronto <sebastiano@tronto.net>	2022-02-13 13:57:27 +0100
committer	Sebastiano Tronto <sebastiano@tronto.net>	2022-02-13 13:57:27 +0100
commit	84ac5f52efc9bc13fd1d3bd18991b1667aaf0413 (patch)
tree	3256a711dbb8690cda8ce670196ecaa7eb689a52
parent	97c9dba402d6d4097cbdc4c44c00222c53122033 (diff)
download	nissy-84ac5f52efc9bc13fd1d3bd18991b1667aaf0413.tar.gz nissy-84ac5f52efc9bc13fd1d3bd18991b1667aaf0413.zip

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 \
14	CC = cc	14	CC = cc
15		15
16		16
17	all: options nissy	17	all: nissy
18
19	options:
20	@echo nissy build options:
21	@echo "CFLAGS = ${CFLAGS}"
22	@echo "CC = ${CC}"
23		18
24	nissy:	19	nissy:
25	${CC} ${CFLAGS} -o nissy src/*.c	20	${CC} ${CFLAGS} -o nissy src/*.c
26		21
27	win:	22	nissy.exe:
28	x86_64-w64-mingw32-gcc ${CFLAGS} -static -o nissy.exe src/*.c	23	x86_64-w64-mingw32-gcc ${CFLAGS} -static -o nissy.exe src/*.c
29		24
30	debug:	25	debug:
31	${CC} ${DBGFLAGS} -o nissy src/*.c	26	${CC} ${DBGFLAGS} -o nissy src/*.c
32		27
33	clean:	28	clean:
34	rm -rf nissy nissy-*.tar.gz	29	rm -rf nissy nissy.exe nissy.tar.gz
35		30
36	dist: clean	31	dist: clean nissy.exe
37	mkdir -p nissy-${VERSION}	32	mkdir -p nissy-${VERSION}
38	cp -R LICENSE Makefile INSTALL doc src nissy-${VERSION}	33	cp -R LICENSE Makefile INSTALL doc src nissy-${VERSION}
39	groff -Tpdf -mandoc doc/nissy.1 > doc/nissy.pdf	34	groff -Tpdf -mandoc doc/nissy.1 > doc/nissy.pdf
@@ -43,6 +38,7 @@ dist: clean
43	tar -cf nissy-${VERSION}.tar nissy-${VERSION}	38	tar -cf nissy-${VERSION}.tar nissy-${VERSION}
44	gzip nissy-${VERSION}.tar	39	gzip nissy-${VERSION}.tar
45	rm -rf nissy-${VERSION}	40	rm -rf nissy-${VERSION}
		41	mv nissy.exe nissy-${VERSION}.exe
46		42
47	install: nissy	43	install: nissy
48	mkdir -p ${DESTDIR}${PREFIX}/bin	44	mkdir -p ${DESTDIR}${PREFIX}/bin
@@ -57,5 +53,5 @@ uninstall:
57	rm -rf ${DESTDIR}${PREFIX}/bin/nissy ${DESTDIR}${MANPREFIX}/man1/nissy.1	53	rm -rf ${DESTDIR}${PREFIX}/bin/nissy ${DESTDIR}${MANPREFIX}/man1/nissy.1
58	for s in ${SCRIPTS}; do rm -rf ${DESTDIR}${PREFIX}/bin/$$s; done	54	for s in ${SCRIPTS}; do rm -rf ${DESTDIR}${PREFIX}/bin/$$s; done
59		55
60	.PHONY: all options win debug clean dist install uninstall	56	.PHONY: all debug clean dist install uninstall
61		57


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.
4	It's more of a personal reminder than anything else.	4	It's more of a personal reminder than anything else.
5		5
6	## For version 2.1	6	## For version 2.1
7	### Bugs
8	* when reading scramble, unmatched ( does not produce any error, unmatched )
9	produces TWO errors but it goes on anyway
10	### Scrambles	7	### Scrambles
11	* Better two-phase solver, make sure to not have cancelling moves	8	* Better two-phase solver, make sure to not have cancelling moves
12	(possibly use cleanup function)	9	(possibly use cleanup function)
@@ -23,6 +20,8 @@ produces TWO errors but it goes on anyway
23	### More	20	### More
24	* Anything quick and easy from the sections below	21	* Anything quick and easy from the sections below
25	* fix LICENSE file	22	* fix LICENSE file
		23	* Download page at nissy.tronto.net, upload every dist version there
		24	(and then always run make clean before git push)
26		25
27	## Commands	26	## Commands
28		27


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 @@
1	<!-- Creator : groff version 1.22.4 -->	1	<!-- Creator : groff version 1.22.4 -->
2	<!-- CreationDate: Wed Dec 29 17:47:39 2021 -->	2	<!-- CreationDate: Sun Feb 13 13:56:11 2022 -->
3	<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"	3	<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
4	"http://www.w3.org/TR/html4/loose.dtd">	4	"http://www.w3.org/TR/html4/loose.dtd">
5	<html>	5	<html>
@@ -29,10 +29,9 @@ Rubik’s cube solver and FMC assistant</p>
29		29
30	<p style="margin-top: 1em"><b>SYNOPSIS</b></p>	30	<p style="margin-top: 1em"><b>SYNOPSIS</b></p>
31		31
32	<p style="margin-left:6%;">[<b>−b</b>]</p>	32	<p style="margin-left:14%;"><b>nissy</b> [<b>−b</b>]
33		33	<b><br>
34	<p style="margin-left:14%;"><b>nissy</b> <i>command</i>	34	nissy</b> <i>command</i> [options...]</p>
35	[options...]</p>
36		35
37	<p style="margin-top: 1em"><b>DESCRIPTION</b></p>	36	<p style="margin-top: 1em"><b>DESCRIPTION</b></p>
38		37
@@ -181,11 +180,10 @@ solutions that require the minimum number of moves.</p>
181		180
182	<p style="margin-left:27%; margin-top: 1em">Only find	181	<p style="margin-left:27%; margin-top: 1em">Only find
183	solutions that require at most <i>N</i> moves more than the	182	solutions that require at most <i>N</i> moves more than the
184	optimal solution. If <i>N</i> is 0, this is equivalent	183	optimal solution. If <i>N</i> is 0, this is equivalent to
185	to</p>	184	<b>−o</b></p>
186		185
187	<p style="margin-top: 1em"><b>−o <br>	186	<p style="margin-top: 1em"><b>−p</b></p>
188	−p</b></p>
189		187
190	<p style="margin-left:27%; margin-top: 1em">Plain style: do	188	<p style="margin-left:27%; margin-top: 1em">Plain style: do
191	not print the number of moves.</p>	189	not print the number of moves.</p>
@@ -310,7 +308,7 @@ D' F R' D B L2 B R2 L U L U2 B D' U R U F2 (18)</p>
310	<b>https://github.com/sebastianotronto/nissy</b></p>	308	<b>https://github.com/sebastianotronto/nissy</b></p>
311		309
312	<p style="margin-left:6%; margin-top: 1em">BSD	310	<p style="margin-left:6%; margin-top: 1em">BSD
313	December 29, 2021 BSD</p>	311	February 13, 2022 BSD</p>
314	<hr>	312	<hr>
315	</body>	313	</body>
316	</html>	314	</html>


diff --git a/doc/nissy.pdf b/doc/nissy.pdf index fa71758..be8433e 100644 --- a/doc/nissy.pdf +++ b/doc/nissy.pdf
Binary files differ


diff --git a/nissy b/nissy deleted file mode 100755 index c70e746..0000000 --- a/nissy +++ /dev/null
Binary files differ


diff --git a/nissy.exe b/nissy.exe deleted file mode 100755 index 74d0607..0000000 --- a/nissy.exe +++ /dev/null
Binary files differ