*** empty log message ***

ase/awk/makefile.in

@@ -1,5 +1,5 @@
 #
-# $Id: makefile.in,v 1.31 2007-04-05 10:14:36 bacon Exp $
+# $Id: makefile.in,v 1.32 2007-04-05 10:37:59 bacon Exp $
 #
 
 NAME = aseawk
@@ -13,16 +13,18 @@ LIBS = @LIBS@
 MODE = @BUILDMODE@
 
 JAVAC = @JAVAC@
+JAR = @JAR@
 CFLAGS_JNI = @CFLAGS_JNI@
 JNI = @JNI@
 
 OUT_DIR = ../$(MODE)/lib
-OUT_FILE = $(OUT_DIR)/lib$(NAME).a
+OUT_FILE_LIB = $(OUT_DIR)/lib$(NAME).a
 OUT_FILE_JNI = $(OUT_DIR)/lib$(NAME)_jni.so
+OUT_FILE_JAR = $(OUT_DIR)/$(NAME).jar
 
 TMP_DIR = $(MODE)
 
-OBJ_FILES = \
+OBJ_FILES_LIB = \
 	$(TMP_DIR)/awk.o \
 	$(TMP_DIR)/err.o \
 	$(TMP_DIR)/tree.o \
@@ -39,18 +41,25 @@ OBJ_FILES = \
 
 OBJ_FILES_JNI = $(TMP_DIR)/jni.o 
 
+OBJ_FILES_JAR = \
+	$(TMP_DIR)/ase/awk/Awk.class \
+	$(TMP_DIR)/ase/awk/StdAwk.class \
+	$(TMP_DIR)/ase/awk/Extio.class \
+	$(TMP_DIR)/ase/awk/Exception.class
+
 lib: build$(JNI)
 
-build: $(OUT_FILE)
+build: $(OUT_FILE_LIB)
 
 buildjni: build $(OUT_FILE_JNI)
 
-$(OUT_FILE): $(OBJ_FILES) $(OUT_DIR)
+$(OUT_FILE_LIB): $(OBJ_FILES_LIB) $(OUT_DIR)
-	$(AR) cr $(OUT_FILE) $(OBJ_FILES)
+	$(AR) cr $(OUT_FILE_LIB) $(OBJ_FILES_LIB)
-	if [ "$(RANLIB)" = "ranlib" ]; then ranlib $(OUT_FILE); fi
+	if [ "$(RANLIB)" = "ranlib" ]; then ranlib $(OUT_FILE_LIB); fi
 
-$(OUT_FILE_JNI): $(OBJ_FILES_JNI) $(OUT_FILE)
+$(OUT_FILE_JNI): $(OBJ_FILES_JNI) $(OBJ_FILES_JAR) $(OUT_FILE_LIB)
 	$(CC) -shared -o $(OUT_FILE_JNI) $(OBJ_FILES_JNI) -lm -L$(OUT_DIR) -l$(NAME)
+	$(JAR) -cvf $(OUT_FILE_JAR) -C $(TMP_DIR) ase
 	
 $(TMP_DIR)/awk.o: $(TMP_DIR)
 	$(CC) $(CFLAGS) -o $@ -c awk.c
@@ -94,6 +103,18 @@ $(TMP_DIR)/rex.o: $(TMP_DIR)
 $(TMP_DIR)/jni.o: $(TMP_DIR)
 	$(CC) $(CFLAGS) $(CFLAGS_JNI) -o $@ -c jni.c
 
+$(TMP_DIR)/ase/awk/Awk.class: $(TMP_DIR)
+	$(JAVAC) -classpath ../.. -d $(TMP_DIR) Awk.java
+
+$(TMP_DIR)/ase/awk/StdAwk.class: $(TMP_DIR)
+	$(JAVAC) -classpath ../.. -d $(TMP_DIR) StdAwk.java
+
+$(TMP_DIR)/ase/awk/Extio.class: $(TMP_DIR)
+	$(JAVAC) -classpath ../.. -d $(TMP_DIR) Extio.java
+
+$(TMP_DIR)/ase/awk/Exception.class: $(TMP_DIR)
+	$(JAVAC) -classpath ../.. -d $(TMP_DIR) Exception.java
+
 $(OUT_DIR):
 	mkdir -p $(OUT_DIR)
 
@@ -101,5 +122,5 @@ $(TMP_DIR):
 	mkdir -p $(TMP_DIR)
 
 clean:
-	rm -rf $(OUT_FILE) $(OBJ_FILES)
+	rm -rf $(OUT_FILE_LIB) $(OUT_FILE_JNI) $(OUT_FILE_JAR) $(OBJ_FILES_LIB) $(OBJ_FILES_JNI) $(OBJ_FILES_JAR)
 

ase/configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.81 .
+# From configure.ac Revision: 1.82 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for ase deb-0.1.0.
 #
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB CPP EGREP BUILDMODE JAVAC_PATH CFLAGS_JNI JAVAC JNI LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB CPP EGREP BUILDMODE JAVAC_PATH JAR_PATH CFLAGS_JNI JAVAC JAR JNI LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -9978,6 +9978,46 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
+# Extract the first word of "jar", so it can be a program name with args.
+set dummy jar; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_JAR_PATH+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $JAR_PATH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_JAR_PATH="$JAR_PATH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_JAR_PATH="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_path_JAR_PATH" && ac_cv_path_JAR_PATH=":"
+  ;;
+esac
+fi
+JAR_PATH=$ac_cv_path_JAR_PATH
+
+if test -n "$JAR_PATH"; then
+  echo "$as_me:$LINENO: result: $JAR_PATH" >&5
+echo "${ECHO_T}$JAR_PATH" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
 
 if test "$JAVAC_PATH" != ":"
 then
@@ -10050,6 +10090,8 @@ CFLAGS_JNI=$CFLAGS_JNI
 
 JAVAC=$JAVAC_PATH
 
+JAR=$JAR_PATH
+
 JNI=$JNI
 
 
@@ -10684,8 +10726,10 @@ s,@CPP@,$CPP,;t t
 s,@EGREP@,$EGREP,;t t
 s,@BUILDMODE@,$BUILDMODE,;t t
 s,@JAVAC_PATH@,$JAVAC_PATH,;t t
+s,@JAR_PATH@,$JAR_PATH,;t t
 s,@CFLAGS_JNI@,$CFLAGS_JNI,;t t
 s,@JAVAC@,$JAVAC,;t t
+s,@JAR@,$JAR,;t t
 s,@JNI@,$JNI,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t

ase/configure.ac

@@ -1,10 +1,10 @@
 #
-# $Id: configure.ac,v 1.82 2007-04-05 10:14:36 bacon Exp $
+# $Id: configure.ac,v 1.83 2007-04-05 10:37:59 bacon Exp $
 # 
 
 AC_PREREQ(2.53)
 AC_INIT([ase], [deb-0.1.0])
-AC_REVISION([$Revision: 1.82 $])
+AC_REVISION([$Revision: 1.83 $])
 AC_CONFIG_HEADER([cmn/conf_unx.h])
 
 # Checks for programs.
@@ -108,6 +108,7 @@ fi
 
 # Java & JNI Configuration 
 AC_PATH_PROG(JAVAC_PATH, javac, :)
+AC_PATH_PROG(JAR_PATH, jar, :)
 
 if test "$JAVAC_PATH" != ":"
 then
@@ -173,6 +174,7 @@ fi
 
 AC_SUBST(CFLAGS_JNI, $CFLAGS_JNI)
 AC_SUBST(JAVAC, $JAVAC_PATH)
+AC_SUBST(JAR, $JAR_PATH)
 AC_SUBST(JNI, $JNI)
 
 AC_CONFIG_FILES([makefile cmn/makefile awk/makefile lsp/makefile utl/makefile test/awk/makefile test/lsp/makefile])