[Pkg-bitcoin-commits] [libunivalue] 27/76: Move files into lib/ and test/ directories.
Jonas Smedegaard
dr at jones.dk
Mon Apr 4 09:18:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
js pushed a commit to branch master
in repository libunivalue.
commit cf2b7d34991ad3abd41f64397edb788a2c6b44af
Author: Jeff Garzik <jgarzik at bitpay.com>
Date: Fri Sep 4 23:05:59 2015 -0400
Move files into lib/ and test/ directories.
---
.gitignore | 4 --
Makefile.am | 62 +---------------------------
configure.ac | 4 +-
lib/.gitignore | 3 ++
lib/Makefile.am | 17 ++++++++
gen.cpp => lib/gen.cpp | 0
numberparse.cpp => lib/numberparse.cpp | 0
univalue.cpp => lib/univalue.cpp | 0
univalue.h => lib/univalue.h | 0
univalue_escapes.h => lib/univalue_escapes.h | 0
univalue_read.cpp => lib/univalue_read.cpp | 0
univalue_write.cpp => lib/univalue_write.cpp | 0
test/.gitignore | 6 +++
Makefile.am => test/Makefile.am | 21 ++--------
fail1.json => test/fail1.json | 0
fail10.json => test/fail10.json | 0
fail11.json => test/fail11.json | 0
fail12.json => test/fail12.json | 0
fail13.json => test/fail13.json | 0
fail14.json => test/fail14.json | 0
fail15.json => test/fail15.json | 0
fail16.json => test/fail16.json | 0
fail17.json => test/fail17.json | 0
fail18.json => test/fail18.json | 0
fail19.json => test/fail19.json | 0
fail2.json => test/fail2.json | 0
fail20.json => test/fail20.json | 0
fail21.json => test/fail21.json | 0
fail22.json => test/fail22.json | 0
fail23.json => test/fail23.json | 0
fail24.json => test/fail24.json | 0
fail25.json => test/fail25.json | 0
fail26.json => test/fail26.json | 0
fail27.json => test/fail27.json | 0
fail28.json => test/fail28.json | 0
fail29.json => test/fail29.json | 0
fail3.json => test/fail3.json | 0
fail30.json => test/fail30.json | 0
fail31.json => test/fail31.json | 0
fail32.json => test/fail32.json | 0
fail33.json => test/fail33.json | 0
fail34.json => test/fail34.json | 0
fail4.json => test/fail4.json | 0
fail5.json => test/fail5.json | 0
fail6.json => test/fail6.json | 0
fail7.json => test/fail7.json | 0
fail8.json => test/fail8.json | 0
fail9.json => test/fail9.json | 0
pass1.json => test/pass1.json | 0
pass2.json => test/pass2.json | 0
pass3.json => test/pass3.json | 0
unitester.cpp => test/unitester.cpp | 0
52 files changed, 32 insertions(+), 85 deletions(-)
diff --git a/.gitignore b/.gitignore
index a742f6a..38cd4a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,3 @@ univalue-config.h*
test-driver
*.o
-*.log
-*.trs
-libunivalue.a
-unitester
diff --git a/Makefile.am b/Makefile.am
index 6241ef3..16b5928 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,63 +1,3 @@
-include_HEADERS = univalue.h univalue_escapes.h
+SUBDIRS = lib test
-lib_LIBRARIES = libunivalue.a
-
-libunivalue_a_SOURCES = \
- univalue.cpp \
- univalue_read.cpp \
- univalue_write.cpp
-
-# ----------------------------------
-# optional add numberparse functions
-# ----------------------------------
-if USE_NUMFUNC
-libunivalue_a_SOURCES += numberparse.cpp
-endif
-
-TESTS = unitester
-
-noinst_PROGRAMS = unitester
-
-unitester_SOURCES = unitester.cpp
-unitester_LDADD = libunivalue.a
-unitester_CXXFLAGS = -DJSON_TEST_SRC=\"$(top_srcdir)\"
-
-EXTRA_DIST = \
- fail10.json \
- fail11.json \
- fail12.json \
- fail13.json \
- fail14.json \
- fail15.json \
- fail16.json \
- fail17.json \
- fail18.json \
- fail19.json \
- fail1.json \
- fail20.json \
- fail21.json \
- fail22.json \
- fail23.json \
- fail24.json \
- fail25.json \
- fail26.json \
- fail27.json \
- fail28.json \
- fail29.json \
- fail2.json \
- fail30.json \
- fail31.json \
- fail32.json \
- fail33.json \
- fail34.json \
- fail3.json \
- fail4.json \
- fail5.json \
- fail6.json \
- fail7.json \
- fail8.json \
- fail9.json \
- pass1.json \
- pass2.json \
- pass3.json
diff --git a/configure.ac b/configure.ac
index fb1d22b..01cb0a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_INIT([univalue], [0.0.1],
[http://github.com/jgarzik/univalue/])
AC_PREREQ(2.52)
-AC_CONFIG_SRCDIR([univalue.cpp])
+AC_CONFIG_SRCDIR([lib/univalue.cpp])
AM_INIT_AUTOMAKE([gnu])
AC_CONFIG_HEADERS([univalue-config.h])
@@ -31,6 +31,6 @@ AM_CONDITIONAL([USE_NUMFUNC], [test x$use_numfunc = xyes])
AC_LANG_PUSH([C++])
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([lib/Makefile test/Makefile Makefile])
AC_OUTPUT
diff --git a/lib/.gitignore b/lib/.gitignore
new file mode 100644
index 0000000..2ea83b3
--- /dev/null
+++ b/lib/.gitignore
@@ -0,0 +1,3 @@
+
+libunivalue.a
+
diff --git a/lib/Makefile.am b/lib/Makefile.am
new file mode 100644
index 0000000..685477d
--- /dev/null
+++ b/lib/Makefile.am
@@ -0,0 +1,17 @@
+
+include_HEADERS = univalue.h univalue_escapes.h
+
+lib_LIBRARIES = libunivalue.a
+
+libunivalue_a_SOURCES = \
+ univalue.cpp \
+ univalue_read.cpp \
+ univalue_write.cpp
+
+# ----------------------------------
+# optional add numberparse functions
+# ----------------------------------
+if USE_NUMFUNC
+libunivalue_a_SOURCES += numberparse.cpp
+endif
+
diff --git a/gen.cpp b/lib/gen.cpp
similarity index 100%
rename from gen.cpp
rename to lib/gen.cpp
diff --git a/numberparse.cpp b/lib/numberparse.cpp
similarity index 100%
rename from numberparse.cpp
rename to lib/numberparse.cpp
diff --git a/univalue.cpp b/lib/univalue.cpp
similarity index 100%
rename from univalue.cpp
rename to lib/univalue.cpp
diff --git a/univalue.h b/lib/univalue.h
similarity index 100%
rename from univalue.h
rename to lib/univalue.h
diff --git a/univalue_escapes.h b/lib/univalue_escapes.h
similarity index 100%
rename from univalue_escapes.h
rename to lib/univalue_escapes.h
diff --git a/univalue_read.cpp b/lib/univalue_read.cpp
similarity index 100%
rename from univalue_read.cpp
rename to lib/univalue_read.cpp
diff --git a/univalue_write.cpp b/lib/univalue_write.cpp
similarity index 100%
rename from univalue_write.cpp
rename to lib/univalue_write.cpp
diff --git a/test/.gitignore b/test/.gitignore
new file mode 100644
index 0000000..082fe6b
--- /dev/null
+++ b/test/.gitignore
@@ -0,0 +1,6 @@
+
+unitester
+
+*.log
+*.trs
+
diff --git a/Makefile.am b/test/Makefile.am
similarity index 60%
copy from Makefile.am
copy to test/Makefile.am
index 6241ef3..b28ec57 100644
--- a/Makefile.am
+++ b/test/Makefile.am
@@ -1,27 +1,11 @@
-include_HEADERS = univalue.h univalue_escapes.h
-
-lib_LIBRARIES = libunivalue.a
-
-libunivalue_a_SOURCES = \
- univalue.cpp \
- univalue_read.cpp \
- univalue_write.cpp
-
-# ----------------------------------
-# optional add numberparse functions
-# ----------------------------------
-if USE_NUMFUNC
-libunivalue_a_SOURCES += numberparse.cpp
-endif
-
TESTS = unitester
noinst_PROGRAMS = unitester
unitester_SOURCES = unitester.cpp
-unitester_LDADD = libunivalue.a
-unitester_CXXFLAGS = -DJSON_TEST_SRC=\"$(top_srcdir)\"
+unitester_LDADD = ../lib/libunivalue.a
+unitester_CXXFLAGS = -I$(top_srcdir)/lib -DJSON_TEST_SRC=\"$(top_srcdir)/test\"
EXTRA_DIST = \
fail10.json \
@@ -61,3 +45,4 @@ EXTRA_DIST = \
pass1.json \
pass2.json \
pass3.json
+
diff --git a/fail1.json b/test/fail1.json
similarity index 100%
rename from fail1.json
rename to test/fail1.json
diff --git a/fail10.json b/test/fail10.json
similarity index 100%
rename from fail10.json
rename to test/fail10.json
diff --git a/fail11.json b/test/fail11.json
similarity index 100%
rename from fail11.json
rename to test/fail11.json
diff --git a/fail12.json b/test/fail12.json
similarity index 100%
rename from fail12.json
rename to test/fail12.json
diff --git a/fail13.json b/test/fail13.json
similarity index 100%
rename from fail13.json
rename to test/fail13.json
diff --git a/fail14.json b/test/fail14.json
similarity index 100%
rename from fail14.json
rename to test/fail14.json
diff --git a/fail15.json b/test/fail15.json
similarity index 100%
rename from fail15.json
rename to test/fail15.json
diff --git a/fail16.json b/test/fail16.json
similarity index 100%
rename from fail16.json
rename to test/fail16.json
diff --git a/fail17.json b/test/fail17.json
similarity index 100%
rename from fail17.json
rename to test/fail17.json
diff --git a/fail18.json b/test/fail18.json
similarity index 100%
rename from fail18.json
rename to test/fail18.json
diff --git a/fail19.json b/test/fail19.json
similarity index 100%
rename from fail19.json
rename to test/fail19.json
diff --git a/fail2.json b/test/fail2.json
similarity index 100%
rename from fail2.json
rename to test/fail2.json
diff --git a/fail20.json b/test/fail20.json
similarity index 100%
rename from fail20.json
rename to test/fail20.json
diff --git a/fail21.json b/test/fail21.json
similarity index 100%
rename from fail21.json
rename to test/fail21.json
diff --git a/fail22.json b/test/fail22.json
similarity index 100%
rename from fail22.json
rename to test/fail22.json
diff --git a/fail23.json b/test/fail23.json
similarity index 100%
rename from fail23.json
rename to test/fail23.json
diff --git a/fail24.json b/test/fail24.json
similarity index 100%
rename from fail24.json
rename to test/fail24.json
diff --git a/fail25.json b/test/fail25.json
similarity index 100%
rename from fail25.json
rename to test/fail25.json
diff --git a/fail26.json b/test/fail26.json
similarity index 100%
rename from fail26.json
rename to test/fail26.json
diff --git a/fail27.json b/test/fail27.json
similarity index 100%
rename from fail27.json
rename to test/fail27.json
diff --git a/fail28.json b/test/fail28.json
similarity index 100%
rename from fail28.json
rename to test/fail28.json
diff --git a/fail29.json b/test/fail29.json
similarity index 100%
rename from fail29.json
rename to test/fail29.json
diff --git a/fail3.json b/test/fail3.json
similarity index 100%
rename from fail3.json
rename to test/fail3.json
diff --git a/fail30.json b/test/fail30.json
similarity index 100%
rename from fail30.json
rename to test/fail30.json
diff --git a/fail31.json b/test/fail31.json
similarity index 100%
rename from fail31.json
rename to test/fail31.json
diff --git a/fail32.json b/test/fail32.json
similarity index 100%
rename from fail32.json
rename to test/fail32.json
diff --git a/fail33.json b/test/fail33.json
similarity index 100%
rename from fail33.json
rename to test/fail33.json
diff --git a/fail34.json b/test/fail34.json
similarity index 100%
rename from fail34.json
rename to test/fail34.json
diff --git a/fail4.json b/test/fail4.json
similarity index 100%
rename from fail4.json
rename to test/fail4.json
diff --git a/fail5.json b/test/fail5.json
similarity index 100%
rename from fail5.json
rename to test/fail5.json
diff --git a/fail6.json b/test/fail6.json
similarity index 100%
rename from fail6.json
rename to test/fail6.json
diff --git a/fail7.json b/test/fail7.json
similarity index 100%
rename from fail7.json
rename to test/fail7.json
diff --git a/fail8.json b/test/fail8.json
similarity index 100%
rename from fail8.json
rename to test/fail8.json
diff --git a/fail9.json b/test/fail9.json
similarity index 100%
rename from fail9.json
rename to test/fail9.json
diff --git a/pass1.json b/test/pass1.json
similarity index 100%
rename from pass1.json
rename to test/pass1.json
diff --git a/pass2.json b/test/pass2.json
similarity index 100%
rename from pass2.json
rename to test/pass2.json
diff --git a/pass3.json b/test/pass3.json
similarity index 100%
rename from pass3.json
rename to test/pass3.json
diff --git a/unitester.cpp b/test/unitester.cpp
similarity index 100%
rename from unitester.cpp
rename to test/unitester.cpp
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/libunivalue.git
More information about the Pkg-bitcoin-commits
mailing list