Fixed config and Makefile for Mac OSX, added shell script version of

runawttest.bat and runswingtest.bat.

Makefile

@@ -61,7 +61,7 @@ apidoc:
 # Build .c files.
 #
 $(SO_FILE): $(OBJS)
-	$(CC) -shared -o$@ $? $(LUA_LIBDIR)/$(LIB_LUA)
+	export MACOSX_DEPLOYMENT_TARGET=10.3; $(CC) -shared -o $@ $? $(LIB_LUA)
 
 src/c/luajava.c: src/c/luajava.h
 

config

@@ -1,17 +1,26 @@
 #############################################################
-#Linux
+#Linux/BSD/Mac
 LUA_DIR= /usr/local/share/lua/5.0
 LUA_LIBDIR= /usr/local/lib/lua/5.0
-LUA_INCLUDES= /usr/local/lib/lua/5.0/include
+LUA_INCLUDES= /usr/local/include
 JDK= $(JAVA_HOME)
+# For Mac OS, comment the above line and uncomment this one
+#JDK=/Library/Java/Home
 
-LIB_LUA= liblua50.a
+# Full path to Lua static library
+LIB_LUA= /home/mascarenhas/lua50/lib/Linux26/liblua50.a
 
+#Linux/BSD
 LIB_EXT= .so
+#Mac OS
+LIB_EXT= .jnilib
 LIB_PREFIX= lib
+#Linux/BSD
 LIB_OPTION= -shared
+#BSD
+LIB_OPTION= -dynamiclib -all_load
 
-## On FreeBSD systems, the following line should be commented
+## On FreeBSD and Mac OS systems, the following line should be commented
 DLLIB= -ldl
 
 WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings
@@ -40,13 +49,6 @@ CC= gcc
 #CC= cl
 
 
-#############################################################
-#Others
-
-#LIB_OPTION= -dynamiclib #for MacOS X
-#LIB_EXT= .dylib
-
-
 #########################################################
 VERSION= 1.0
 PKG= luajava-$(VERSION)
@@ -56,4 +58,4 @@ JAR_FILE= $(PKG).jar
 SO_FILE= $(LIB_PREFIX)$(PKG)$(LIB_EXT)
 DIST_DIR= $(PKG)
 
-# $Id: config,v 1.7 2005-05-23 15:49:39 tuler Exp $
+# $Id: config,v 1.8 2005-06-15 19:03:26 mascarenhas Exp $

test/runawttest.bat

@@ -1 +1 @@
-java -cp "../luajava-1.0b4.jar" -Djava.library.path=.. org.keplerproject.luajava.Console awttest.lua
+java -cp "../luajava-1.0.jar" -Djava.library.path=.. org.keplerproject.luajava.Console awttest.lua

test/runawttest.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+java -cp "../luajava-1.0.jar" -Djava.library.path=.. org.keplerproject.luajava.Console awtTest.lua

test/runswingtest.bat

@@ -1 +1 @@
-java -cp "../luajava-1.0b4.jar" -Djava.library.path=.. org.keplerproject.luajava.Console swingtest.lua
+java -cp "../luajava-1.0.jar" -Djava.library.path=.. org.keplerproject.luajava.Console swingtest.lua

test/runswingtest.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+java -cp "../luajava-1.0.jar" -Djava.library.path=.. org.keplerproject.luajava.Console swingTest.lua