From: j8takagi Date: Sun, 4 Nov 2012 14:01:09 +0000 (+0900) Subject: バージョン表示に関する修正 X-Git-Tag: v0.2p4 X-Git-Url: https://j8takagi.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=727c76d45fcb333ef5906826079e56e7f6d04fd3;p=YACASL2.git バージョン表示に関する修正 バージョンの形式をv${VERSION}p${PATCH_LEVEL}形式に変更 --- diff --git a/Makefile b/Makefile index 60e271e..d4014fc 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ GITTAG := git tag prefix ?= ~ bindir ?= $(prefix)/bin +VERSION = $(shell $(CAT) VERSION) VERSIONFILES = include/package.h test/system/casl2/opt_v/0.txt test/system/comet2/opt_v/0.txt test/system/dumpword/opt_v/0.txt all: build docall gtags @@ -49,22 +50,22 @@ install-info: $(MAKE) -C doc install-info uninstall-info: - @$(MAKE) -C doc uninstall-info + $(MAKE) -C doc uninstall-info install-casl2lib: $(MAKE) -C as/casl2lib install-casl2lib uninstall-casl2lib: - @$(MAKE) -C as/casl2lib uninstall-casl2lib + $(MAKE) -C as/casl2lib uninstall-casl2lib -version: VERSION $(VERSIONFILES) - @$(ECHO) "YACASL2 Version:" `$(CAT) VERSION` +version: $(VERSIONFILES) + @$(ECHO) "YACASL2 Version: $(VERSION)" $(VERSIONFILES): VERSION - $(SED) -e "s/@@VERSION@@/`cat VERSION`/g" $@.version >$@ + $(SED) -e "s/@@VERSION@@/$(VERSION)/g" $@.version >$@ gittag: VERSION - $(CAT) $@ | $(XARGS) $(GITTAG) + $(GITTAG) $(VERSION) clean: clean-src clean-gtags clean-doc clean-doc-inner clean-version diff --git a/VERSION b/VERSION index 5880996..937ab22 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2p3 +v0.2p4 diff --git a/test/system/casl2/cmd_out/0.txt b/test/system/casl2/cmd_out/0.txt index 3d18777..89e9f01 100644 --- a/test/system/casl2/cmd_out/0.txt +++ b/test/system/casl2/cmd_out/0.txt @@ -409,7 +409,7 @@ Executing machine codes #000C: Register:::: #000C: GR0: 0 = #0000 = 0000000000000000 -#000C: GR1: 176 = #00B0 = 0000000010110000 = '°' +#000C: GR1: 176 = #00B0 = 0000000010110000 #000C: GR2: 77 = #004D = 0000000001001101 = 'M' #000C: GR3: 0 = #0000 = 0000000000000000 #000C: GR4: 0 = #0000 = 0000000000000000 @@ -440,8 +440,8 @@ Executing machine codes #000E: Register:::: #000E: GR0: 0 = #0000 = 0000000000000000 -#000E: GR1: 176 = #00B0 = 0000000010110000 = '°' -#000E: GR2: 177 = #00B1 = 0000000010110001 = '±' +#000E: GR1: 176 = #00B0 = 0000000010110000 +#000E: GR2: 177 = #00B1 = 0000000010110001 #000E: GR3: 0 = #0000 = 0000000000000000 #000E: GR4: 0 = #0000 = 0000000000000000 #000E: GR5: 0 = #0000 = 0000000000000000 @@ -472,8 +472,8 @@ Executing machine codes #0010: Register:::: #0010: GR0: 0 = #0000 = 0000000000000000 -#0010: GR1: 176 = #00B0 = 0000000010110000 = '°' -#0010: GR2: 177 = #00B1 = 0000000010110001 = '±' +#0010: GR1: 176 = #00B0 = 0000000010110000 +#0010: GR2: 177 = #00B1 = 0000000010110001 #0010: GR3: 0 = #0000 = 0000000000000000 #0010: GR4: 0 = #0000 = 0000000000000000 #0010: GR5: 0 = #0000 = 0000000000000000 @@ -503,7 +503,7 @@ Executing machine codes #0011: Register:::: #0011: GR0: 0 = #0000 = 0000000000000000 -#0011: GR1: 176 = #00B0 = 0000000010110000 = '°' +#0011: GR1: 176 = #00B0 = 0000000010110000 #0011: GR2: 0 = #0000 = 0000000000000000 #0011: GR3: 0 = #0000 = 0000000000000000 #0011: GR4: 0 = #0000 = 0000000000000000 @@ -720,7 +720,7 @@ Executing machine codes #001E: Register:::: #001E: GR0: 0 = #0000 = 0000000000000000 -#001E: GR1: 178 = #00B2 = 0000000010110010 = '²' +#001E: GR1: 178 = #00B2 = 0000000010110010 #001E: GR2: 110 = #006E = 0000000001101110 = 'n' #001E: GR3: 0 = #0000 = 0000000000000000 #001E: GR4: 0 = #0000 = 0000000000000000 @@ -751,8 +751,8 @@ Executing machine codes #0020: Register:::: #0020: GR0: 0 = #0000 = 0000000000000000 -#0020: GR1: 178 = #00B2 = 0000000010110010 = '²' -#0020: GR2: 179 = #00B3 = 0000000010110011 = '³' +#0020: GR1: 178 = #00B2 = 0000000010110010 +#0020: GR2: 179 = #00B3 = 0000000010110011 #0020: GR3: 0 = #0000 = 0000000000000000 #0020: GR4: 0 = #0000 = 0000000000000000 #0020: GR5: 0 = #0000 = 0000000000000000 @@ -783,8 +783,8 @@ Executing machine codes #0022: Register:::: #0022: GR0: 0 = #0000 = 0000000000000000 -#0022: GR1: 178 = #00B2 = 0000000010110010 = '²' -#0022: GR2: 179 = #00B3 = 0000000010110011 = '³' +#0022: GR1: 178 = #00B2 = 0000000010110010 +#0022: GR2: 179 = #00B3 = 0000000010110011 #0022: GR3: 0 = #0000 = 0000000000000000 #0022: GR4: 0 = #0000 = 0000000000000000 #0022: GR5: 0 = #0000 = 0000000000000000 @@ -814,7 +814,7 @@ Executing machine codes #0023: Register:::: #0023: GR0: 0 = #0000 = 0000000000000000 -#0023: GR1: 178 = #00B2 = 0000000010110010 = '²' +#0023: GR1: 178 = #00B2 = 0000000010110010 #0023: GR2: 0 = #0000 = 0000000000000000 #0023: GR3: 0 = #0000 = 0000000000000000 #0023: GR4: 0 = #0000 = 0000000000000000 @@ -1031,7 +1031,7 @@ Executing machine codes #0030: Register:::: #0030: GR0: 0 = #0000 = 0000000000000000 -#0030: GR1: 180 = #00B4 = 0000000010110100 = '´' +#0030: GR1: 180 = #00B4 = 0000000010110100 #0030: GR2: 143 = #008F = 0000000010001111 #0030: GR3: 0 = #0000 = 0000000000000000 #0030: GR4: 0 = #0000 = 0000000000000000 @@ -1062,8 +1062,8 @@ Executing machine codes #0032: Register:::: #0032: GR0: 0 = #0000 = 0000000000000000 -#0032: GR1: 180 = #00B4 = 0000000010110100 = '´' -#0032: GR2: 181 = #00B5 = 0000000010110101 = 'µ' +#0032: GR1: 180 = #00B4 = 0000000010110100 +#0032: GR2: 181 = #00B5 = 0000000010110101 #0032: GR3: 0 = #0000 = 0000000000000000 #0032: GR4: 0 = #0000 = 0000000000000000 #0032: GR5: 0 = #0000 = 0000000000000000 @@ -1094,8 +1094,8 @@ Executing machine codes #0034: Register:::: #0034: GR0: 0 = #0000 = 0000000000000000 -#0034: GR1: 180 = #00B4 = 0000000010110100 = '´' -#0034: GR2: 181 = #00B5 = 0000000010110101 = 'µ' +#0034: GR1: 180 = #00B4 = 0000000010110100 +#0034: GR2: 181 = #00B5 = 0000000010110101 #0034: GR3: 0 = #0000 = 0000000000000000 #0034: GR4: 0 = #0000 = 0000000000000000 #0034: GR5: 0 = #0000 = 0000000000000000 @@ -1125,7 +1125,7 @@ Executing machine codes #0035: Register:::: #0035: GR0: 0 = #0000 = 0000000000000000 -#0035: GR1: 180 = #00B4 = 0000000010110100 = '´' +#0035: GR1: 180 = #00B4 = 0000000010110100 #0035: GR2: 0 = #0000 = 0000000000000000 #0035: GR3: 0 = #0000 = 0000000000000000 #0035: GR4: 0 = #0000 = 0000000000000000 @@ -1281,7 +1281,7 @@ Executing machine codes #003E: Register:::: #003E: GR0: 0 = #0000 = 0000000000000000 #003E: GR1: 144 = #0090 = 0000000010010000 -#003E: GR2: 175 = #00AF = 0000000010101111 = '¯' +#003E: GR2: 175 = #00AF = 0000000010101111 #003E: GR3: 0 = #0000 = 0000000000000000 #003E: GR4: 0 = #0000 = 0000000000000000 #003E: GR5: 0 = #0000 = 0000000000000000 @@ -1312,7 +1312,7 @@ Executing machine codes `abcdefghijklmnopqrstuvwxyz{|}~#0040: Register:::: #0040: GR0: 0 = #0000 = 0000000000000000 #0040: GR1: 144 = #0090 = 0000000010010000 -#0040: GR2: 175 = #00AF = 0000000010101111 = '¯' +#0040: GR2: 175 = #00AF = 0000000010101111 #0040: GR3: 0 = #0000 = 0000000000000000 #0040: GR4: 0 = #0000 = 0000000000000000 #0040: GR5: 0 = #0000 = 0000000000000000 @@ -1342,8 +1342,8 @@ Executing machine codes #0042: Register:::: #0042: GR0: 0 = #0000 = 0000000000000000 -#0042: GR1: 182 = #00B6 = 0000000010110110 = '¶' -#0042: GR2: 175 = #00AF = 0000000010101111 = '¯' +#0042: GR1: 182 = #00B6 = 0000000010110110 +#0042: GR2: 175 = #00AF = 0000000010101111 #0042: GR3: 0 = #0000 = 0000000000000000 #0042: GR4: 0 = #0000 = 0000000000000000 #0042: GR5: 0 = #0000 = 0000000000000000 @@ -1373,8 +1373,8 @@ Executing machine codes #0044: Register:::: #0044: GR0: 0 = #0000 = 0000000000000000 -#0044: GR1: 182 = #00B6 = 0000000010110110 = '¶' -#0044: GR2: 183 = #00B7 = 0000000010110111 = '·' +#0044: GR1: 182 = #00B6 = 0000000010110110 +#0044: GR2: 183 = #00B7 = 0000000010110111 #0044: GR3: 0 = #0000 = 0000000000000000 #0044: GR4: 0 = #0000 = 0000000000000000 #0044: GR5: 0 = #0000 = 0000000000000000 @@ -1405,8 +1405,8 @@ Executing machine codes #0046: Register:::: #0046: GR0: 0 = #0000 = 0000000000000000 -#0046: GR1: 182 = #00B6 = 0000000010110110 = '¶' -#0046: GR2: 183 = #00B7 = 0000000010110111 = '·' +#0046: GR1: 182 = #00B6 = 0000000010110110 +#0046: GR2: 183 = #00B7 = 0000000010110111 #0046: GR3: 0 = #0000 = 0000000000000000 #0046: GR4: 0 = #0000 = 0000000000000000 #0046: GR5: 0 = #0000 = 0000000000000000 @@ -1436,7 +1436,7 @@ Executing machine codes #0047: Register:::: #0047: GR0: 0 = #0000 = 0000000000000000 -#0047: GR1: 182 = #00B6 = 0000000010110110 = '¶' +#0047: GR1: 182 = #00B6 = 0000000010110110 #0047: GR2: 0 = #0000 = 0000000000000000 #0047: GR3: 0 = #0000 = 0000000000000000 #0047: GR4: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2/opt_v/.gitignore b/test/system/casl2/opt_v/.gitignore new file mode 100644 index 0000000..bce32ad --- /dev/null +++ b/test/system/casl2/opt_v/.gitignore @@ -0,0 +1 @@ +0.txt diff --git a/test/system/casl2/opt_v/0.txt b/test/system/casl2/opt_v/0.txt deleted file mode 100644 index f945c59..0000000 --- a/test/system/casl2/opt_v/0.txt +++ /dev/null @@ -1 +0,0 @@ -casl2 of YACASL2 version 0.2p2 diff --git a/test/system/comet2/cmd_out/0.txt b/test/system/comet2/cmd_out/0.txt index b18c6d8..dc5fb4b 100644 --- a/test/system/comet2/cmd_out/0.txt +++ b/test/system/comet2/cmd_out/0.txt @@ -189,7 +189,7 @@ Executing machine codes #000C: Register:::: #000C: GR0: 0 = #0000 = 0000000000000000 -#000C: GR1: 176 = #00B0 = 0000000010110000 = '°' +#000C: GR1: 176 = #00B0 = 0000000010110000 #000C: GR2: 77 = #004D = 0000000001001101 = 'M' #000C: GR3: 0 = #0000 = 0000000000000000 #000C: GR4: 0 = #0000 = 0000000000000000 @@ -220,8 +220,8 @@ Executing machine codes #000E: Register:::: #000E: GR0: 0 = #0000 = 0000000000000000 -#000E: GR1: 176 = #00B0 = 0000000010110000 = '°' -#000E: GR2: 177 = #00B1 = 0000000010110001 = '±' +#000E: GR1: 176 = #00B0 = 0000000010110000 +#000E: GR2: 177 = #00B1 = 0000000010110001 #000E: GR3: 0 = #0000 = 0000000000000000 #000E: GR4: 0 = #0000 = 0000000000000000 #000E: GR5: 0 = #0000 = 0000000000000000 @@ -252,8 +252,8 @@ Executing machine codes #0010: Register:::: #0010: GR0: 0 = #0000 = 0000000000000000 -#0010: GR1: 176 = #00B0 = 0000000010110000 = '°' -#0010: GR2: 177 = #00B1 = 0000000010110001 = '±' +#0010: GR1: 176 = #00B0 = 0000000010110000 +#0010: GR2: 177 = #00B1 = 0000000010110001 #0010: GR3: 0 = #0000 = 0000000000000000 #0010: GR4: 0 = #0000 = 0000000000000000 #0010: GR5: 0 = #0000 = 0000000000000000 @@ -283,7 +283,7 @@ Executing machine codes #0011: Register:::: #0011: GR0: 0 = #0000 = 0000000000000000 -#0011: GR1: 176 = #00B0 = 0000000010110000 = '°' +#0011: GR1: 176 = #00B0 = 0000000010110000 #0011: GR2: 0 = #0000 = 0000000000000000 #0011: GR3: 0 = #0000 = 0000000000000000 #0011: GR4: 0 = #0000 = 0000000000000000 @@ -500,7 +500,7 @@ Executing machine codes #001E: Register:::: #001E: GR0: 0 = #0000 = 0000000000000000 -#001E: GR1: 178 = #00B2 = 0000000010110010 = '²' +#001E: GR1: 178 = #00B2 = 0000000010110010 #001E: GR2: 110 = #006E = 0000000001101110 = 'n' #001E: GR3: 0 = #0000 = 0000000000000000 #001E: GR4: 0 = #0000 = 0000000000000000 @@ -531,8 +531,8 @@ Executing machine codes #0020: Register:::: #0020: GR0: 0 = #0000 = 0000000000000000 -#0020: GR1: 178 = #00B2 = 0000000010110010 = '²' -#0020: GR2: 179 = #00B3 = 0000000010110011 = '³' +#0020: GR1: 178 = #00B2 = 0000000010110010 +#0020: GR2: 179 = #00B3 = 0000000010110011 #0020: GR3: 0 = #0000 = 0000000000000000 #0020: GR4: 0 = #0000 = 0000000000000000 #0020: GR5: 0 = #0000 = 0000000000000000 @@ -563,8 +563,8 @@ Executing machine codes #0022: Register:::: #0022: GR0: 0 = #0000 = 0000000000000000 -#0022: GR1: 178 = #00B2 = 0000000010110010 = '²' -#0022: GR2: 179 = #00B3 = 0000000010110011 = '³' +#0022: GR1: 178 = #00B2 = 0000000010110010 +#0022: GR2: 179 = #00B3 = 0000000010110011 #0022: GR3: 0 = #0000 = 0000000000000000 #0022: GR4: 0 = #0000 = 0000000000000000 #0022: GR5: 0 = #0000 = 0000000000000000 @@ -594,7 +594,7 @@ Executing machine codes #0023: Register:::: #0023: GR0: 0 = #0000 = 0000000000000000 -#0023: GR1: 178 = #00B2 = 0000000010110010 = '²' +#0023: GR1: 178 = #00B2 = 0000000010110010 #0023: GR2: 0 = #0000 = 0000000000000000 #0023: GR3: 0 = #0000 = 0000000000000000 #0023: GR4: 0 = #0000 = 0000000000000000 @@ -811,7 +811,7 @@ Executing machine codes #0030: Register:::: #0030: GR0: 0 = #0000 = 0000000000000000 -#0030: GR1: 180 = #00B4 = 0000000010110100 = '´' +#0030: GR1: 180 = #00B4 = 0000000010110100 #0030: GR2: 143 = #008F = 0000000010001111 #0030: GR3: 0 = #0000 = 0000000000000000 #0030: GR4: 0 = #0000 = 0000000000000000 @@ -842,8 +842,8 @@ Executing machine codes #0032: Register:::: #0032: GR0: 0 = #0000 = 0000000000000000 -#0032: GR1: 180 = #00B4 = 0000000010110100 = '´' -#0032: GR2: 181 = #00B5 = 0000000010110101 = 'µ' +#0032: GR1: 180 = #00B4 = 0000000010110100 +#0032: GR2: 181 = #00B5 = 0000000010110101 #0032: GR3: 0 = #0000 = 0000000000000000 #0032: GR4: 0 = #0000 = 0000000000000000 #0032: GR5: 0 = #0000 = 0000000000000000 @@ -874,8 +874,8 @@ Executing machine codes #0034: Register:::: #0034: GR0: 0 = #0000 = 0000000000000000 -#0034: GR1: 180 = #00B4 = 0000000010110100 = '´' -#0034: GR2: 181 = #00B5 = 0000000010110101 = 'µ' +#0034: GR1: 180 = #00B4 = 0000000010110100 +#0034: GR2: 181 = #00B5 = 0000000010110101 #0034: GR3: 0 = #0000 = 0000000000000000 #0034: GR4: 0 = #0000 = 0000000000000000 #0034: GR5: 0 = #0000 = 0000000000000000 @@ -905,7 +905,7 @@ Executing machine codes #0035: Register:::: #0035: GR0: 0 = #0000 = 0000000000000000 -#0035: GR1: 180 = #00B4 = 0000000010110100 = '´' +#0035: GR1: 180 = #00B4 = 0000000010110100 #0035: GR2: 0 = #0000 = 0000000000000000 #0035: GR3: 0 = #0000 = 0000000000000000 #0035: GR4: 0 = #0000 = 0000000000000000 @@ -1061,7 +1061,7 @@ Executing machine codes #003E: Register:::: #003E: GR0: 0 = #0000 = 0000000000000000 #003E: GR1: 144 = #0090 = 0000000010010000 -#003E: GR2: 175 = #00AF = 0000000010101111 = '¯' +#003E: GR2: 175 = #00AF = 0000000010101111 #003E: GR3: 0 = #0000 = 0000000000000000 #003E: GR4: 0 = #0000 = 0000000000000000 #003E: GR5: 0 = #0000 = 0000000000000000 @@ -1092,7 +1092,7 @@ Executing machine codes `abcdefghijklmnopqrstuvwxyz{|}~#0040: Register:::: #0040: GR0: 0 = #0000 = 0000000000000000 #0040: GR1: 144 = #0090 = 0000000010010000 -#0040: GR2: 175 = #00AF = 0000000010101111 = '¯' +#0040: GR2: 175 = #00AF = 0000000010101111 #0040: GR3: 0 = #0000 = 0000000000000000 #0040: GR4: 0 = #0000 = 0000000000000000 #0040: GR5: 0 = #0000 = 0000000000000000 @@ -1122,8 +1122,8 @@ Executing machine codes #0042: Register:::: #0042: GR0: 0 = #0000 = 0000000000000000 -#0042: GR1: 182 = #00B6 = 0000000010110110 = '¶' -#0042: GR2: 175 = #00AF = 0000000010101111 = '¯' +#0042: GR1: 182 = #00B6 = 0000000010110110 +#0042: GR2: 175 = #00AF = 0000000010101111 #0042: GR3: 0 = #0000 = 0000000000000000 #0042: GR4: 0 = #0000 = 0000000000000000 #0042: GR5: 0 = #0000 = 0000000000000000 @@ -1153,8 +1153,8 @@ Executing machine codes #0044: Register:::: #0044: GR0: 0 = #0000 = 0000000000000000 -#0044: GR1: 182 = #00B6 = 0000000010110110 = '¶' -#0044: GR2: 183 = #00B7 = 0000000010110111 = '·' +#0044: GR1: 182 = #00B6 = 0000000010110110 +#0044: GR2: 183 = #00B7 = 0000000010110111 #0044: GR3: 0 = #0000 = 0000000000000000 #0044: GR4: 0 = #0000 = 0000000000000000 #0044: GR5: 0 = #0000 = 0000000000000000 @@ -1185,8 +1185,8 @@ Executing machine codes #0046: Register:::: #0046: GR0: 0 = #0000 = 0000000000000000 -#0046: GR1: 182 = #00B6 = 0000000010110110 = '¶' -#0046: GR2: 183 = #00B7 = 0000000010110111 = '·' +#0046: GR1: 182 = #00B6 = 0000000010110110 +#0046: GR2: 183 = #00B7 = 0000000010110111 #0046: GR3: 0 = #0000 = 0000000000000000 #0046: GR4: 0 = #0000 = 0000000000000000 #0046: GR5: 0 = #0000 = 0000000000000000 @@ -1216,7 +1216,7 @@ Executing machine codes #0047: Register:::: #0047: GR0: 0 = #0000 = 0000000000000000 -#0047: GR1: 182 = #00B6 = 0000000010110110 = '¶' +#0047: GR1: 182 = #00B6 = 0000000010110110 #0047: GR2: 0 = #0000 = 0000000000000000 #0047: GR3: 0 = #0000 = 0000000000000000 #0047: GR4: 0 = #0000 = 0000000000000000 diff --git a/test/system/comet2/opt_v/.gitignore b/test/system/comet2/opt_v/.gitignore new file mode 100644 index 0000000..bce32ad --- /dev/null +++ b/test/system/comet2/opt_v/.gitignore @@ -0,0 +1 @@ +0.txt diff --git a/test/system/comet2/opt_v/0.txt b/test/system/comet2/opt_v/0.txt deleted file mode 100644 index 3953d3b..0000000 --- a/test/system/comet2/opt_v/0.txt +++ /dev/null @@ -1 +0,0 @@ -comet2 of YACASL2 version 0.2p2 diff --git a/test/system/dumpword/opt_v/.gitignore b/test/system/dumpword/opt_v/.gitignore new file mode 100644 index 0000000..bce32ad --- /dev/null +++ b/test/system/dumpword/opt_v/.gitignore @@ -0,0 +1 @@ +0.txt diff --git a/test/system/dumpword/opt_v/0.txt b/test/system/dumpword/opt_v/0.txt deleted file mode 100644 index 2841fe6..0000000 --- a/test/system/dumpword/opt_v/0.txt +++ /dev/null @@ -1 +0,0 @@ -dumpword of YACASL2 version 0.2p2