From bb769c0ed6540b5714b4bf9fdc75393a606288ab Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 23 Mar 2013 19:38:49 +0700 Subject: [PATCH] Lua debian package --- .gitignore | 12 +- Makefile | 33 ++- luaejdb/Makefile | 20 +- luaejdb/debian/changelog | 5 + luaejdb/debian/compat | 1 + luaejdb/debian/control | 26 +++ luaejdb/debian/copyright | 74 +++++++ luaejdb/debian/lua51-ejdb.install | 0 luaejdb/debian/lua51-ejdb.lintian-overrides | 2 + luaejdb/debian/rules | 5 + luaejdb/debian/rules.mk | 1 + luaejdb/debian/source/format | 1 + ...jdb-1.0-2.rockspec => luaejdb-1.0.1-1.rockspec} | 2 +- node/nbproject/configurations.xml | 229 --------------------- pyejdb/Makefile | 2 +- pyejdb/debian/control | 2 +- tcejdb/Makefile.in | 2 +- tcejdb/nbproject/configurations.xml | 159 +++++++++++--- 18 files changed, 300 insertions(+), 276 deletions(-) create mode 100644 luaejdb/debian/changelog create mode 100644 luaejdb/debian/compat create mode 100644 luaejdb/debian/control create mode 100644 luaejdb/debian/copyright create mode 100644 luaejdb/debian/lua51-ejdb.install create mode 100644 luaejdb/debian/lua51-ejdb.lintian-overrides create mode 100755 luaejdb/debian/rules create mode 120000 luaejdb/debian/rules.mk create mode 100644 luaejdb/debian/source/format rename luaejdb/{luaejdb-1.0-2.rockspec => luaejdb-1.0.1-1.rockspec} (97%) diff --git a/.gitignore b/.gitignore index 293223b..19f7dce 100644 --- a/.gitignore +++ b/.gitignore @@ -97,4 +97,14 @@ tcejdb/debian/*.debhelper /python3-ejdb_*.deb -luaejdb/test/testdb* +/luaejdb/debian/files +/luaejdb/test/testdb* +/luaejdb/debian/lua51-ejdb* +/luaejdb/debian/*.log +/lua-ejdb_*.build +/lua-ejdb_*.dsc +/lua-ejdb_*.gz +/lua-ejdb_*.build +/lua-ejdb_*.changes +/lua51-ejdb_*.deb + diff --git a/Makefile b/Makefile index 252e8ad..d21b24e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,5 @@ -all: fix-changelogs - cd tcejdb && autoconf && ./configure - $(MAKE) -C ./tcejdb version +all: init $(MAKE) -C ./tcejdb clean: @@ -11,18 +9,35 @@ clean: - rm -f *.upload - rm -f libtcejdb*.tar.gz libtcejdb*.deb libtcejdb*.changes libtcejdb*.build libtcejdb*.dsc - rm -f python*.tar.gz python*.deb python*.changes python*.build python*.dsc + - rm -f lua*.tar.gz lua*.deb lua*.changes lua*.build lua*.dsc -deb-packages: fix-changelogs - cd ./tcejdb && autoconf && ./configure - $(MAKE) -C ./tcejdb version deb-packages +deb-packages: deb-packages-tcejdb deb-packages-pyejdb deb-packages-luaejdb; + +deb-packages-tcejdb: init + $(MAKE) -C ./tcejdb deb-packages + +deb-packages-pyejdb: init $(MAKE) -C ./pyejdb deb-packages -deb-source-packages: fix-changelogs +deb-packages-luaejdb: init + $(MAKE) -C ./luaejdb deb-packages + +deb-source-packages: $(MAKE) -C ./ deb-packages DEBUILD_OPTS="-S" +deb-source-packages-tcejdb: + $(MAKE) -C ./ deb-packages-tcejdb DEBUILD_OPTS="-S" -fix-changelogs: +deb-source-packages-pyejdb: + $(MAKE) -C ./ deb-packages-pyejdb DEBUILD_OPTS="-S" + +deb-source-packages-luaejdb: + $(MAKE) -C ./ deb-packages-luaejdb DEBUILD_OPTS="-S" + +init: + cd ./tcejdb && autoconf && ./configure + $(MAKE) -C ./tcejdb version cp ./Changelog ./tcejdb/Changelog -.PHONY: all clean deb-packages deb-source-packages fix-changelogs +.PHONY: all clean deb-packages deb-source-packages init initdeb diff --git a/luaejdb/Makefile b/luaejdb/Makefile index 547b17b..0f26bff 100644 --- a/luaejdb/Makefile +++ b/luaejdb/Makefile @@ -1,11 +1,13 @@ +UMASK=022 + all: doc build build: - luarocks --pack-binary-rock make + umask $(UMASK) && luarocks --pack-binary-rock make build-dbg: - luarocks --pack-binary-rock CFLAGS='-g -O0 -fPIC -std=c99 -Wall' make + umask $(UMASK) && luarocks --pack-binary-rock CFLAGS='-g -O0 -fPIC -std=c99 -Wall' make check: build-dbg make -C ./test @@ -21,5 +23,17 @@ clean: - rm -f *.so *.rock ./ejdb/*.so - make -C ./test clean +install: + $(if $(DESTDIR), $(MAKE) install-deb, $(MAKE) install-ndeb) + +install-deb: + install -d $(DESTDIR)/usr + umask $(UMASK) && luarocks --tree=$(DESTDIR)/usr make + +install-ndeb: + umask $(UMASK) && luarocks make + +deb-packages: clean + debuild --no-tgz-check $(DEBUILD_OPTS) -.PHONY: all build build-dbg check check-valgrind clean doc +.PHONY: all build build-dbg check check-valgrind clean doc install install-ndeb install-deb diff --git a/luaejdb/debian/changelog b/luaejdb/debian/changelog new file mode 100644 index 0000000..b462667 --- /dev/null +++ b/luaejdb/debian/changelog @@ -0,0 +1,5 @@ +lua-ejdb (1.0.1-1) unstable; urgency=low + + * Initial release. + + -- Anton Adamansky Sat, 23 Mar 2013 12:02:09 +0700 diff --git a/luaejdb/debian/compat b/luaejdb/debian/compat new file mode 100644 index 0000000..f11c82a --- /dev/null +++ b/luaejdb/debian/compat @@ -0,0 +1 @@ +9 \ No newline at end of file diff --git a/luaejdb/debian/control b/luaejdb/debian/control new file mode 100644 index 0000000..d74c125 --- /dev/null +++ b/luaejdb/debian/control @@ -0,0 +1,26 @@ +Source: lua-ejdb +Section: database +Priority: optional +Maintainer: Anton Adamansky +Build-Depends: + debhelper (>= 9), + libtcejdb9-dev (>= 1.0.68), + luarocks (>= 2.0), +Standards-Version: 3.9.3 +Homepage: http://ejdb.org +Vcs-Browser: https://github.com/Softmotions/ejdb +Vcs-Git: https://github.com/Softmotions/ejdb.git + +Package: lua51-ejdb +Architecture: any +Depends: + ${misc:Depends}, + ${shlibs:Depends}, + libtcejdb9 (>= 1.0.68) +Recommends: lua5.1 +Description: Lua binding for EJDB + EJDB aims to be a fast MongoDB-like library which can be embedded into C/C++/NodeJS/Python/Lua + applications under terms of LGPL license. + . + This package provides a Lua wrapper for EJDB. + diff --git a/luaejdb/debian/copyright b/luaejdb/debian/copyright new file mode 100644 index 0000000..5bb8405 --- /dev/null +++ b/luaejdb/debian/copyright @@ -0,0 +1,74 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ejdb +Upstream-Contact: Anton Adamansky +Comment: This package was dowloaded from https://github.com/Softmotions/ejdb + +Files: debian/* +Copyright: Copyright (c) 2012-2013 Anton Adamansky +Comment: The Debian Packaging is under the BSD license. +License: BSD + Copyright (c) 2012-2013 Anton Adamansky + All rights reserved. + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + . + Redistributions in binary form must reproduce the above copyright notice, this + list of conditions and the following disclaimer in the documentation and/or + other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: ejdb/inspect.lua +Copyright: Enrique García Cota +License: BSD + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + . + Redistributions in binary form must reproduce the above copyright notice, this + list of conditions and the following disclaimer in the documentation and/or + other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +Files: * +Copyright: Copyright (c) 2012-2013 Anton Adamansky +License: LGPL-2.1+ + EJDB is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2.1 of the License or any later + version. EJDB is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser + General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public License + along with EJDB; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian GNU/Linux systems, the complete text of the GNU Lesser General + Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. diff --git a/luaejdb/debian/lua51-ejdb.install b/luaejdb/debian/lua51-ejdb.install new file mode 100644 index 0000000..e69de29 diff --git a/luaejdb/debian/lua51-ejdb.lintian-overrides b/luaejdb/debian/lua51-ejdb.lintian-overrides new file mode 100644 index 0000000..65d0cab --- /dev/null +++ b/luaejdb/debian/lua51-ejdb.lintian-overrides @@ -0,0 +1,2 @@ +lua51-ejdb: extended-description-line-too-long +lua51-ejdb: new-package-should-close-itp-bug \ No newline at end of file diff --git a/luaejdb/debian/rules b/luaejdb/debian/rules new file mode 100755 index 0000000..ed933e6 --- /dev/null +++ b/luaejdb/debian/rules @@ -0,0 +1,5 @@ +#!/usr/bin/make -f +#export DH_VERBOSE=1 + +%: + dh $@ diff --git a/luaejdb/debian/rules.mk b/luaejdb/debian/rules.mk new file mode 120000 index 0000000..f7358b2 --- /dev/null +++ b/luaejdb/debian/rules.mk @@ -0,0 +1 @@ +./rules \ No newline at end of file diff --git a/luaejdb/debian/source/format b/luaejdb/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/luaejdb/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/luaejdb/luaejdb-1.0-2.rockspec b/luaejdb/luaejdb-1.0.1-1.rockspec similarity index 97% rename from luaejdb/luaejdb-1.0-2.rockspec rename to luaejdb/luaejdb-1.0.1-1.rockspec index 7b00a59..6619560 100644 --- a/luaejdb/luaejdb-1.0-2.rockspec +++ b/luaejdb/luaejdb-1.0.1-1.rockspec @@ -1,5 +1,5 @@ package = "luaejdb" -version = "1.0-2" +version = "1.0.1-1" source = { url = "https://github.com/Softmotions/ejdb.git" } diff --git a/node/nbproject/configurations.xml b/node/nbproject/configurations.xml index e5f11e5..2e34177 100644 --- a/node/nbproject/configurations.xml +++ b/node/nbproject/configurations.xml @@ -3837,235 +3837,6 @@ - - - - debug-support.cc - experimental-libraries.cc - libraries.cc - node_natives.h - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - snapshot.cc - - - - - - - - - - - - - - diff --git a/pyejdb/Makefile b/pyejdb/Makefile index 2fd0d06..d10757f 100644 --- a/pyejdb/Makefile +++ b/pyejdb/Makefile @@ -7,6 +7,6 @@ clean: - rm -rf ./dist deb-packages: clean - debuild $(DEBUILD_OPTS) + debuild --no-tgz-check $(DEBUILD_OPTS) .PHONY: all clean deb-packages \ No newline at end of file diff --git a/pyejdb/debian/control b/pyejdb/debian/control index 3a39d07..974236f 100644 --- a/pyejdb/debian/control +++ b/pyejdb/debian/control @@ -25,7 +25,7 @@ Depends: Provides: ${python3:Provides} Description: Python3 binding for EJDB - EJDB aims to be a fast MongoDB-like library which can be embedded into C/C++ and NodeJS + EJDB aims to be a fast MongoDB-like library which can be embedded into C/C++/NodeJS/Python/Lua applications under terms of LGPL license. . This package provides a Python3 wrapper for EJDB. diff --git a/tcejdb/Makefile.in b/tcejdb/Makefile.in index 74fabef..3d4ef23 100644 --- a/tcejdb/Makefile.in +++ b/tcejdb/Makefile.in @@ -677,7 +677,7 @@ wordtable : deb-packages : - debuild $(DEBUILD_OPTS) + debuild --no-tgz-check $(DEBUILD_OPTS) diff --git a/tcejdb/nbproject/configurations.xml b/tcejdb/nbproject/configurations.xml index cf6c1db..2695f47 100644 --- a/tcejdb/nbproject/configurations.xml +++ b/tcejdb/nbproject/configurations.xml @@ -1,7 +1,9 @@ - + - + + + bdbtest.c cdbtest.c @@ -15,15 +17,140 @@ tctest.c tdbtest.c + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bson.h + ejdb.h + ejdb_private.h + myconf.h + tcadb.h + tcbdb.h + tcfdb.h + tchdb.h + tctdb.h + tcutil.h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bson.h + ejdb.h + ejdb_private.h + myconf.h + tcadb.h + tcbdb.h + tcfdb.h + tchdb.h + tctdb.h + tcutil.h + + + + + + + + + + + + + + + + + + + + + + + + + sample1.c + + t1.c t2.c t3.c + t4.c bson.c bson.h @@ -172,8 +299,6 @@ - - @@ -181,16 +306,10 @@ - - - - - - @@ -199,8 +318,6 @@ - - @@ -223,8 +340,6 @@ - - @@ -233,8 +348,6 @@ - - @@ -251,8 +364,6 @@ - - @@ -273,8 +384,6 @@ - - @@ -291,8 +400,6 @@ - - @@ -309,8 +416,6 @@ - - @@ -327,8 +432,6 @@ - - @@ -361,8 +464,6 @@ - - @@ -382,8 +483,6 @@ - - -- 2.7.4