リリースブランチをマージ。

dromozoa · Jan 28, 2019 · 8646fd9 · 8646fd9
2 parents 5d278d5 + f2f4d4f
commit 8646fd9
Show file tree

Hide file tree

Showing 20 changed files with 375 additions and 1,309 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,35 +1,3 @@
-*.in
-*.la
-*.lo
 *.o
 *.so
 .*.swp
-.deps
-.libs
-/INSTALL
-/aclocal.m4
-/autom4te.cache
-/autom4te.cache
-/compile
-/config.guess
-/config.h
-/config.log
-/config.status
-/config.sub
-/configure
-/depcomp
-/install-sh
-/libtool
-/ltmain.sh
-/m4/libtool.m4
-/m4/ltoptions.m4
-/m4/ltsugar.m4
-/m4/ltversion.m4
-/m4/lt~obsolete.m4
-/missing
-/stamp-h1
-/test-driver
-/test-suite.log
-/test.sh.log
-/test.sh.trs
-Makefile
diff --git a/AUTHORS b/AUTHORS
diff --git a/ChangeLog b/ChangeLog
diff --git a/Makefile.am → Makefile b/Makefile.am → Makefile
@@ -15,28 +15,34 @@
 # You should have received a copy of the GNU General Public License
 # along with dromozoa-multi.  If not, see <http://www.gnu.org/licenses/>.
 
-ACLOCAL_AMFLAGS = -I m4
-
-EXTRA_DIST = \
-	.gitignore \
-	README.md \
-	bind \
-	docs \
-	dromozoa-multi-*.rockspec \
-	m4/update \
-	test \
-	$(TESTS)
-TESTS = test.sh
-
-luaexec_LTLIBRARIES = multi.la
-
-noinst_HEADERS = common.hpp
-
-multi_la_CPPFLAGS = -I$(top_srcdir)/bind
-multi_la_LDFLAGS = -module -avoid-version -shared
-multi_la_SOURCES = \
-	main.cpp \
-	state.cpp \
-	state_handle.cpp \
-	module.cpp \
-	thread.cpp
+CPPFLAGS += -Ibind -I$(LUA_INCDIR)
+CXXFLAGS += -Wall -W $(CFLAGS)
+LDFLAGS += -L$(LUA_LIBDIR) $(LIBFLAG)
+LDLIBS += -lpthread -ldl
+
+OBJS = \
+	env.o \
+	main.o \
+	state.o \
+	state_handle.o \
+	module.o \
+	thread.o
+TARGET = multi.so
+
+all: $(TARGET)
+
+clean:
+	rm -f *.o $(TARGET)
+
+check:
+	./test.sh
+
+multi.so: $(OBJS)
+	$(CXX) $(LDFLAGS) $^ $(LDLIBS) -o $@
+
+.cpp.o:
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+install:
+	mkdir -p $(LIBDIR)/dromozoa
+	cp $(TARGET) $(LIBDIR)/dromozoa
diff --git a/NEWS b/NEWS
diff --git a/README b/README
diff --git a/configure.ac b/configure.ac
diff --git a/docs/index.html b/docs/index.html
@@ -25,6 +25,25 @@
 
 <h1>dromozoa-multi</h1>
 
+<h2>環境</h2>
+
+<pre>
+local multi = require "dromozoa.multi"
+lcoal env = multi.env
+
+-- set
+env.key = value
+multi.set("key", value)
+
+-- remove
+env.key = nil
+multi.set "key"
+
+-- get
+print(env.key)
+print(multi.get "key")
+</pre>
+
 </div>
 </body>
 </html>
diff --git a/dromozoa-multi-1.5-1.rockspec b/dromozoa-multi-1.5-1.rockspec
diff --git a/dromozoa-multi-1.6-1.rockspec b/dromozoa-multi-1.6-1.rockspec
@@ -0,0 +1,29 @@
+rockspec_format = "3.0"
+package = "dromozoa-multi"
+version = "1.6-1"
+source = {
+  url = "https://github.com/dromozoa/dromozoa-multi/releases/download/v1.6/dromozoa-multi-1.6.tar.gz";
+}
+description = {
+  summary = "Multiple Lua states and native threads";
+  license = "GPL-3";
+  homepage = "https://github.com/dromozoa/dromozoa-multi/";
+  maintainer = "Tomoyuki Fujimori <moyu@dromozoa.com>";
+}
+test = {
+  type = "command";
+  command = "./test.sh";
+}
+
+build = {
+  type = "make";
+  build_variables = {
+    CFLAGS = "$(CFLAGS)";
+    LIBFLAG = "$(LIBFLAG)";
+    LUA_INCDIR = "$(LUA_INCDIR)";
+    LUA_LIBDIR = "$(LUA_LIBDIR)";
+  };
+  install_variables = {
+    LIBDIR = "$(LIBDIR)";
+  };
+}