*** empty log message ***

This commit is contained in:
hyung-hwan 2007-04-12 11:28:14 +00:00
parent d5c8c9848f
commit fc60298782
4 changed files with 22 additions and 15 deletions

View File

@ -1,4 +1,4 @@
<!-- $Id: build.xml,v 1.10 2007-04-10 15:08:12 bacon Exp $ --> <!-- $Id: build.xml,v 1.11 2007-04-12 11:28:14 bacon Exp $ -->
<project name="ase" default="release" basedir="."> <project name="ase" default="release" basedir=".">
@ -52,7 +52,8 @@
<unjar src="${libdir}/aseawk.jar" dest="${bindir}" /> <unjar src="${libdir}/aseawk.jar" dest="${bindir}" />
<jar jarfile="${bindir}/aseawk.jar" <jar jarfile="${bindir}/aseawk.jar"
basedir="${bindir}" basedir="${bindir}"
includes="**/*.class" /> includes="**/*.class"
manifest="test/awk/manifest" />
<delete> <delete>
<fileset dir="${bindir}" includes="*.class" /> <fileset dir="${bindir}" includes="*.class" />
</delete> </delete>

View File

@ -1,5 +1,5 @@
/* /*
* $Id: AseAwkPanel.java,v 1.3 2007-04-12 11:19:11 bacon Exp $ * $Id: AseAwkPanel.java,v 1.4 2007-04-12 11:23:49 bacon Exp $
*/ */
import java.awt.*; import java.awt.*;
@ -357,7 +357,12 @@ public class AseAwkPanel extends Panel
} }
catch (UnsatisfiedLinkError e) catch (UnsatisfiedLinkError e)
{ {
showMessage ("Cannot load libraryi - " + e.getMessage()); showMessage ("Cannot load library - " + e.getMessage());
return;
}
catch (Exception e)
{
showMessage ("Cannot load library - " + e.getMessage());
return; return;
} }
} }

View File

@ -1,5 +1,5 @@
# #
# $Id: makefile.in,v 1.22 2007-04-12 10:51:14 bacon Exp $ # $Id: makefile.in,v 1.23 2007-04-12 11:19:11 bacon Exp $
# #
CC = @CC@ CC = @CC@
@ -21,9 +21,9 @@ ASEAWK_LIB =
all: build$(JNI) all: build$(JNI)
build: $(TMP_DIR) $(OUT_DIR)/aseawk $(OUT_DIR)/aseawk_mini build: $(TMP_DIR) $(OUT_DIR) $(OUT_DIR)/aseawk $(OUT_DIR)/aseawk_mini
buildjni: $(TMP_DIR) build $(OUT_DIR)/aseawk.jar $(OUT_DIR)/AseAwkApplet.html buildjni: build $(OUT_DIR)/aseawk.jar $(OUT_DIR)/AseAwkApplet.html
$(OUT_DIR)/aseawk: awk.c $(OUT_DIR)/aseawk: awk.c
$(CC) $(CFLAGS) -o $@ awk.c $(LDFLAGS) $(LIBS) $(CC) $(CFLAGS) -o $@ awk.c $(LDFLAGS) $(LIBS)
@ -31,21 +31,21 @@ $(OUT_DIR)/aseawk: awk.c
$(OUT_DIR)/aseawk_mini: mini.c $(OUT_DIR)/aseawk_mini: mini.c
$(CC) $(CFLAGS) -o $@ mini.c $(LDFLAGS) $(LIBS) $(CC) $(CFLAGS) -o $@ mini.c $(LDFLAGS) $(LIBS)
$(OUT_DIR)/aseawk.jar: $(TMP_DIR)/AseAwk.class $(TMP_DIR)/AseAwkPanel.class $(TMP_DIR)/AseAwkApplet.class $(OUT_DIR)/aseawk.jar: $(TMP_DIR)/AseAwkPanel.class $(TMP_DIR)/AseAwk.class $(TMP_DIR)/AseAwkApplet.class
cd $(TMP_DIR); $(JAR) -xvf ../$(LIB_DIR)/aseawk.jar cd $(TMP_DIR); $(JAR) -xvf ../$(LIB_DIR)/aseawk.jar
cd $(TMP_DIR); $(JAR) -Mcvf ../$@ *.class ase cd $(TMP_DIR); $(JAR) -cvfm ../$@ ../manifest *.class ase
rm -rf $(TMP_DIR)/ase rm -rf $(TMP_DIR)/ase
$(TMP_DIR)/AseAwk.class: $(TMP_DIR) AseAwk.java $(TMP_DIR)/AseAwkPanel.class: AseAwkPanel.java
$(JAVAC) -classpath $(TMP_DIR):$(LIB_DIR)/aseawk.jar -d $(TMP_DIR) AseAwk.java
$(TMP_DIR)/AseAwkPanel.class: $(TMP_DIR) AseAwkPanel.java
$(JAVAC) -classpath $(TMP_DIR):$(LIB_DIR)/aseawk.jar -d $(TMP_DIR) AseAwkPanel.java $(JAVAC) -classpath $(TMP_DIR):$(LIB_DIR)/aseawk.jar -d $(TMP_DIR) AseAwkPanel.java
$(TMP_DIR)/AseAwkApplet.class: $(TMP_DIR) AseAwkApplet.java $(TMP_DIR)/AseAwk.class: AseAwk.java
$(JAVAC) -classpath $(TMP_DIR):$(LIB_DIR)/aseawk.jar -d $(TMP_DIR) AseAwk.java
$(TMP_DIR)/AseAwkApplet.class: AseAwkApplet.java
$(JAVAC) -classpath $(TMP_DIR):$(LIB_DIR)/aseawk.jar -d $(TMP_DIR) AseAwkApplet.java $(JAVAC) -classpath $(TMP_DIR):$(LIB_DIR)/aseawk.jar -d $(TMP_DIR) AseAwkApplet.java
$(OUT_DIR)/AseAwkApplet.html: AseAwkApplet.html $(OUT_DIR) $(OUT_DIR)/AseAwkApplet.html: AseAwkApplet.html
cp -pf AseAwkApplet.html $(OUT_DIR) cp -pf AseAwkApplet.html $(OUT_DIR)
$(OUT_DIR): $(OUT_DIR):

1
ase/test/awk/manifest Normal file
View File

@ -0,0 +1 @@
Main-Class: AseAwk