Change ./test folder references to ./cli

vgmstream · Jan 18, 2018 · 23998b0 · 23998b0
1 parent 94d361b
commit 23998b0
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,9 +29,9 @@ Release
 /fb2k/Release
 /src/Debug
 /src/Release
-/test/Debug
-/test/Release
-/test/*.exe
+/cli/Debug
+/cli/Release
+/cli/*.exe
 /winamp/Debug
 /winamp/Release
 /winamp/*.dll

diff --git a/BUILD.md b/BUILD.md
@@ -32,7 +32,7 @@ set PATH=C:\Program Files (x86)\mingw-w64\i686-5.4.0-win32-sjlj-rt_v5-rev0\mingw
 
 cd vgmstream
 
-mingw32-make.exe mingw_test -f Makefile ^
+mingw32-make.exe vgmstream_cli -f Makefile ^
  VGM_ENABLE_FFMPEG=1 VGM_ENABLE_MAIATRAC3PLUS=0 ^
  SHELL=sh.exe CC=gcc.exe AR=ar.exe STRIP=strip.exe DLLTOOL=dlltool.exe WINDRES=windres.exe
 ```
@@ -145,14 +145,14 @@ There are no hard coding rules but for consistency should follow general C conve
 ```
 ./                   docs, scripts
 ./audacious/         Audacious plugin
+./cli/               CLI tools
 ./ext_includes/      external includes for compiling
 ./ext_libs/          external libs/DLLs for linking
 ./fb2k/              foobar2000 plugin
 ./src/               main vgmstream code and helpers
 ./src/coding/        format data decoders
 ./src/layout/        format data demuxers
 ./src/meta/          format header parsers
-./test/              CLI tools
 ./winamp/            Winamp plugin
 ./xmplay/            XMPlay plugin
 ```

diff --git a/Makefile b/Makefile
@@ -61,13 +61,13 @@ sourceball:
 	rm -rf vgmstream-`./version.sh`
 
 bin mingwbin: vgmstream_cli winamp xmplay
-	zip -FS -j "vgmstream-`./version.sh`-test.zip" COPYING README.md test/test.exe winamp/in_vgmstream.dll xmplay/xmp-vgmstream.dll ext_libs/*.dll
+	zip -FS -j "vgmstream-`./version.sh`-test.zip" COPYING README.md cli/test.exe winamp/in_vgmstream.dll xmplay/xmp-vgmstream.dll ext_libs/*.dll
 
 vgmstream_cli mingw_test:
-	$(MAKE) -C test vgmstream_cli
+	$(MAKE) -C cli vgmstream_cli
 
 vgmstream123:
-	$(MAKE) -C test vgmstream123
+	$(MAKE) -C cli vgmstream123
 
 winamp mingw_winamp:
 	$(MAKE) -C winamp in_vgmstream
@@ -78,7 +78,7 @@ xmplay mingw_xmplay:
 clean:
 	$(RMF) vgmstream-*.zip
 	$(MAKE) -C src clean
-	$(MAKE) -C test clean
+	$(MAKE) -C cli clean
 	$(MAKE) -C winamp clean
 	$(MAKE) -C xmplay clean
 	$(MAKE) -C ext_libs clean

diff --git a/Makefile.autotools.am b/Makefile.autotools.am
@@ -3,6 +3,6 @@
 
 AM_MAKEFLAGS=-f Makefile.autotools
 
-SUBDIRS = src audacious test
+SUBDIRS = src audacious cli
 
 EXTRA_DIST = version.h
diff --git a/cli/test.c b/cli/test.c
@@ -30,7 +30,7 @@ static void make_wav_header(uint8_t * buf, int32_t sample_count, int32_t sample_
 static void make_smpl_chunk(uint8_t * buf, int32_t loop_start, int32_t loop_end);
 
 static void usage(const char * name) {
-    fprintf(stderr,"vgmstream test decoder " VERSION " " __DATE__ "\n"
+    fprintf(stderr,"vgmstream CLI decoder " VERSION " " __DATE__ "\n"
           "Usage: %s [-o outfile.wav] [options] infile\n"
           "Options:\n"
           "    -o outfile.wav: name of output .wav file, default is infile.wav\n"

diff --git a/configure.ac b/configure.ac
@@ -66,5 +66,5 @@ AC_OUTPUT([
   src/layout/Makefile.autotools
   src/meta/Makefile.autotools
   audacious/Makefile.autotools
-  test/Makefile.autotools
+  cli/Makefile.autotools
 ])
diff --git a/unbootstrap b/unbootstrap
@@ -1,4 +1,4 @@
 #!/bin/sh
 # vgmstream autotools script - reverses the actions of bootstrap
 
-rm -rf configure AUTHORS compile depcomp ChangeLog config.guess ltmain.sh README config.sub autom4te.cache Makefile.autotools.in INSTALL missing NEWS aclocal.m4 install-sh audacious/config.h.in audacious/main.loT audacious/Makefile.autotools.in src/Makefile.autotools.in src/coding/Makefile.autotools.in src/meta/Makefile.autotools.in src/layout/Makefile.autotools.in test/Makefile.autotools.in
+rm -rf configure AUTHORS compile depcomp ChangeLog config.guess ltmain.sh README config.sub autom4te.cache Makefile.autotools.in INSTALL missing NEWS aclocal.m4 install-sh audacious/config.h.in audacious/main.loT audacious/Makefile.autotools.in src/Makefile.autotools.in src/coding/Makefile.autotools.in src/meta/Makefile.autotools.in src/layout/Makefile.autotools.in cli/Makefile.autotools.in
diff --git a/vgmstream.sln b/vgmstream.sln
@@ -11,7 +11,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "in_vgmstream", "winamp\in_v
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext_libs", "ext_libs\ext_libs.vcproj", "{10E6BFC6-1E5B-46E4-BA42-F04DFBD0ABFF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcproj", "{AF7D88A0-3CB1-4CD8-BAD1-0305EB996D69}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "cli\test.vcproj", "{AF7D88A0-3CB1-4CD8-BAD1-0305EB996D69}"
 	ProjectSection(ProjectDependencies) = postProject
 		{54A6AD11-5369-4895-A06F-E255ABB99B11} = {54A6AD11-5369-4895-A06F-E255ABB99B11}
 		{42D86561-8CE4-40F5-86CE-58C986B77502} = {42D86561-8CE4-40F5-86CE-58C986B77502}

diff --git a/vgmstream_full.sln b/vgmstream_full.sln
@@ -13,7 +13,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fdk-aac", "..\fdk-aac\msvc\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4v2", "..\qaac\vcproject\mp4v2\mp4v2.vcxproj", "{86A064E2-C81B-4EEE-8BE0-A39A2E7C7C76}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcxproj", "{AF7D88A0-3CB1-4CD8-BAD1-0305EB996D69}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "cli\test.vcxproj", "{AF7D88A0-3CB1-4CD8-BAD1-0305EB996D69}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "in_vgmstream", "winamp\in_vgmstream.vcxproj", "{42D86561-8CE4-40F5-86CE-58C986B77502}"
 EndProject