diff --git a/ase/ase.sln b/ase/ase.sln index 34caebcb..28d16560 100644 --- a/ase/ase.sln +++ b/ase/ase.sln @@ -78,8 +78,8 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {17621C83-40C9-4305-BAF9-132E250B5FE3}.Debug|Any CPU.ActiveCfg = Debug|Win32 {17621C83-40C9-4305-BAF9-132E250B5FE3}.Debug|Any CPU.Build.0 = Debug|Win32 - {17621C83-40C9-4305-BAF9-132E250B5FE3}.Debug|Win32.ActiveCfg = Debug MD|Win32 - {17621C83-40C9-4305-BAF9-132E250B5FE3}.Debug|Win32.Build.0 = Debug MD|Win32 + {17621C83-40C9-4305-BAF9-132E250B5FE3}.Debug|Win32.ActiveCfg = Debug|Win32 + {17621C83-40C9-4305-BAF9-132E250B5FE3}.Debug|Win32.Build.0 = Debug|Win32 {17621C83-40C9-4305-BAF9-132E250B5FE3}.Debug|x64.ActiveCfg = Debug|x64 {17621C83-40C9-4305-BAF9-132E250B5FE3}.Debug|x64.Build.0 = Debug|x64 {17621C83-40C9-4305-BAF9-132E250B5FE3}.Release|Any CPU.ActiveCfg = Release|Win32 @@ -90,8 +90,8 @@ Global {17621C83-40C9-4305-BAF9-132E250B5FE3}.Release|x64.Build.0 = Release|x64 {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD}.Debug|Any CPU.ActiveCfg = Debug|Win32 {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD}.Debug|Any CPU.Build.0 = Debug|Win32 - {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD}.Debug|Win32.ActiveCfg = Debug MD|Win32 - {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD}.Debug|Win32.Build.0 = Debug MD|Win32 + {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD}.Debug|Win32.ActiveCfg = Debug|Win32 + {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD}.Debug|Win32.Build.0 = Debug|Win32 {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD}.Debug|x64.ActiveCfg = Debug|x64 {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD}.Debug|x64.Build.0 = Debug|x64 {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD}.Release|Any CPU.ActiveCfg = Release|Win32 @@ -102,8 +102,8 @@ Global {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD}.Release|x64.Build.0 = Release|x64 {5F2E77D5-1485-48D1-9371-987BC55FEE83}.Debug|Any CPU.ActiveCfg = Debug|Win32 {5F2E77D5-1485-48D1-9371-987BC55FEE83}.Debug|Any CPU.Build.0 = Debug|Win32 - {5F2E77D5-1485-48D1-9371-987BC55FEE83}.Debug|Win32.ActiveCfg = Debug MD|Win32 - {5F2E77D5-1485-48D1-9371-987BC55FEE83}.Debug|Win32.Build.0 = Debug MD|Win32 + {5F2E77D5-1485-48D1-9371-987BC55FEE83}.Debug|Win32.ActiveCfg = Debug|Win32 + {5F2E77D5-1485-48D1-9371-987BC55FEE83}.Debug|Win32.Build.0 = Debug|Win32 {5F2E77D5-1485-48D1-9371-987BC55FEE83}.Debug|x64.ActiveCfg = Debug|x64 {5F2E77D5-1485-48D1-9371-987BC55FEE83}.Debug|x64.Build.0 = Debug|x64 {5F2E77D5-1485-48D1-9371-987BC55FEE83}.Release|Any CPU.ActiveCfg = Release|Win32 @@ -114,8 +114,8 @@ Global {5F2E77D5-1485-48D1-9371-987BC55FEE83}.Release|x64.Build.0 = Release|x64 {23B58791-FD44-4F95-9F77-34E4AF45A296}.Debug|Any CPU.ActiveCfg = Debug|Win32 {23B58791-FD44-4F95-9F77-34E4AF45A296}.Debug|Any CPU.Build.0 = Debug|Win32 - {23B58791-FD44-4F95-9F77-34E4AF45A296}.Debug|Win32.ActiveCfg = Debug MD|Win32 - {23B58791-FD44-4F95-9F77-34E4AF45A296}.Debug|Win32.Build.0 = Debug MD|Win32 + {23B58791-FD44-4F95-9F77-34E4AF45A296}.Debug|Win32.ActiveCfg = Debug|Win32 + {23B58791-FD44-4F95-9F77-34E4AF45A296}.Debug|Win32.Build.0 = Debug|Win32 {23B58791-FD44-4F95-9F77-34E4AF45A296}.Debug|x64.ActiveCfg = Debug|x64 {23B58791-FD44-4F95-9F77-34E4AF45A296}.Debug|x64.Build.0 = Debug|x64 {23B58791-FD44-4F95-9F77-34E4AF45A296}.Release|Any CPU.ActiveCfg = Release|Win32 @@ -126,8 +126,8 @@ Global {23B58791-FD44-4F95-9F77-34E4AF45A296}.Release|x64.Build.0 = Release|x64 {963AF7B5-12E6-42B6-8CBE-89136C1A109B}.Debug|Any CPU.ActiveCfg = Debug|Win32 {963AF7B5-12E6-42B6-8CBE-89136C1A109B}.Debug|Any CPU.Build.0 = Debug|Win32 - {963AF7B5-12E6-42B6-8CBE-89136C1A109B}.Debug|Win32.ActiveCfg = Debug MD|Win32 - {963AF7B5-12E6-42B6-8CBE-89136C1A109B}.Debug|Win32.Build.0 = Debug MD|Win32 + {963AF7B5-12E6-42B6-8CBE-89136C1A109B}.Debug|Win32.ActiveCfg = Debug|Win32 + {963AF7B5-12E6-42B6-8CBE-89136C1A109B}.Debug|Win32.Build.0 = Debug|Win32 {963AF7B5-12E6-42B6-8CBE-89136C1A109B}.Debug|x64.ActiveCfg = Debug|x64 {963AF7B5-12E6-42B6-8CBE-89136C1A109B}.Debug|x64.Build.0 = Debug|x64 {963AF7B5-12E6-42B6-8CBE-89136C1A109B}.Release|Any CPU.ActiveCfg = Release|Win32 @@ -138,8 +138,8 @@ Global {963AF7B5-12E6-42B6-8CBE-89136C1A109B}.Release|x64.Build.0 = Release|x64 {57F1E1D0-28B6-42BF-BAFB-045AEE2DCF4F}.Debug|Any CPU.ActiveCfg = Debug|Win32 {57F1E1D0-28B6-42BF-BAFB-045AEE2DCF4F}.Debug|Any CPU.Build.0 = Debug|Win32 - {57F1E1D0-28B6-42BF-BAFB-045AEE2DCF4F}.Debug|Win32.ActiveCfg = Debug MD|Win32 - {57F1E1D0-28B6-42BF-BAFB-045AEE2DCF4F}.Debug|Win32.Build.0 = Debug MD|Win32 + {57F1E1D0-28B6-42BF-BAFB-045AEE2DCF4F}.Debug|Win32.ActiveCfg = Debug|Win32 + {57F1E1D0-28B6-42BF-BAFB-045AEE2DCF4F}.Debug|Win32.Build.0 = Debug|Win32 {57F1E1D0-28B6-42BF-BAFB-045AEE2DCF4F}.Debug|x64.ActiveCfg = Debug|x64 {57F1E1D0-28B6-42BF-BAFB-045AEE2DCF4F}.Debug|x64.Build.0 = Debug|x64 {57F1E1D0-28B6-42BF-BAFB-045AEE2DCF4F}.Release|Any CPU.ActiveCfg = Release|Win32 @@ -150,8 +150,8 @@ Global {57F1E1D0-28B6-42BF-BAFB-045AEE2DCF4F}.Release|x64.Build.0 = Release|x64 {42FE7CED-34B7-45C8-92C9-8856E16640D2}.Debug|Any CPU.ActiveCfg = Debug|Win32 {42FE7CED-34B7-45C8-92C9-8856E16640D2}.Debug|Any CPU.Build.0 = Debug|Win32 - {42FE7CED-34B7-45C8-92C9-8856E16640D2}.Debug|Win32.ActiveCfg = Debug MD|Win32 - {42FE7CED-34B7-45C8-92C9-8856E16640D2}.Debug|Win32.Build.0 = Debug MD|Win32 + {42FE7CED-34B7-45C8-92C9-8856E16640D2}.Debug|Win32.ActiveCfg = Debug|Win32 + {42FE7CED-34B7-45C8-92C9-8856E16640D2}.Debug|Win32.Build.0 = Debug|Win32 {42FE7CED-34B7-45C8-92C9-8856E16640D2}.Debug|x64.ActiveCfg = Debug|x64 {42FE7CED-34B7-45C8-92C9-8856E16640D2}.Debug|x64.Build.0 = Debug|x64 {42FE7CED-34B7-45C8-92C9-8856E16640D2}.Release|Any CPU.ActiveCfg = Release|Win32 @@ -162,8 +162,8 @@ Global {42FE7CED-34B7-45C8-92C9-8856E16640D2}.Release|x64.Build.0 = Release|x64 {868702B0-CB6B-4F1D-B98A-32193347EFAF}.Debug|Any CPU.ActiveCfg = Debug|Win32 {868702B0-CB6B-4F1D-B98A-32193347EFAF}.Debug|Any CPU.Build.0 = Debug|Win32 - {868702B0-CB6B-4F1D-B98A-32193347EFAF}.Debug|Win32.ActiveCfg = Debug MD|Win32 - {868702B0-CB6B-4F1D-B98A-32193347EFAF}.Debug|Win32.Build.0 = Debug MD|Win32 + {868702B0-CB6B-4F1D-B98A-32193347EFAF}.Debug|Win32.ActiveCfg = Debug|Win32 + {868702B0-CB6B-4F1D-B98A-32193347EFAF}.Debug|Win32.Build.0 = Debug|Win32 {868702B0-CB6B-4F1D-B98A-32193347EFAF}.Debug|x64.ActiveCfg = Debug|x64 {868702B0-CB6B-4F1D-B98A-32193347EFAF}.Debug|x64.Build.0 = Debug|x64 {868702B0-CB6B-4F1D-B98A-32193347EFAF}.Release|Any CPU.ActiveCfg = Release|Win32 @@ -174,8 +174,8 @@ Global {868702B0-CB6B-4F1D-B98A-32193347EFAF}.Release|x64.Build.0 = Release|x64 {E7A8B741-4E9D-4ED4-9F77-E7F637A678A5}.Debug|Any CPU.ActiveCfg = Debug|Win32 {E7A8B741-4E9D-4ED4-9F77-E7F637A678A5}.Debug|Any CPU.Build.0 = Debug|Win32 - {E7A8B741-4E9D-4ED4-9F77-E7F637A678A5}.Debug|Win32.ActiveCfg = Debug MD|Win32 - {E7A8B741-4E9D-4ED4-9F77-E7F637A678A5}.Debug|Win32.Build.0 = Debug MD|Win32 + {E7A8B741-4E9D-4ED4-9F77-E7F637A678A5}.Debug|Win32.ActiveCfg = Debug|Win32 + {E7A8B741-4E9D-4ED4-9F77-E7F637A678A5}.Debug|Win32.Build.0 = Debug|Win32 {E7A8B741-4E9D-4ED4-9F77-E7F637A678A5}.Debug|x64.ActiveCfg = Debug|x64 {E7A8B741-4E9D-4ED4-9F77-E7F637A678A5}.Debug|x64.Build.0 = Debug|x64 {E7A8B741-4E9D-4ED4-9F77-E7F637A678A5}.Release|Any CPU.ActiveCfg = Release|Win32 @@ -186,8 +186,8 @@ Global {E7A8B741-4E9D-4ED4-9F77-E7F637A678A5}.Release|x64.Build.0 = Release|x64 {3BEA6CFE-C158-4BFB-B5FB-ED85251E3F98}.Debug|Any CPU.ActiveCfg = Debug|Win32 {3BEA6CFE-C158-4BFB-B5FB-ED85251E3F98}.Debug|Any CPU.Build.0 = Debug|Win32 - {3BEA6CFE-C158-4BFB-B5FB-ED85251E3F98}.Debug|Win32.ActiveCfg = Debug MD|Win32 - {3BEA6CFE-C158-4BFB-B5FB-ED85251E3F98}.Debug|Win32.Build.0 = Debug MD|Win32 + {3BEA6CFE-C158-4BFB-B5FB-ED85251E3F98}.Debug|Win32.ActiveCfg = Debug|Win32 + {3BEA6CFE-C158-4BFB-B5FB-ED85251E3F98}.Debug|Win32.Build.0 = Debug|Win32 {3BEA6CFE-C158-4BFB-B5FB-ED85251E3F98}.Debug|x64.ActiveCfg = Debug|x64 {3BEA6CFE-C158-4BFB-B5FB-ED85251E3F98}.Debug|x64.Build.0 = Debug|x64 {3BEA6CFE-C158-4BFB-B5FB-ED85251E3F98}.Release|Any CPU.ActiveCfg = Release|Win32 @@ -198,8 +198,8 @@ Global {3BEA6CFE-C158-4BFB-B5FB-ED85251E3F98}.Release|x64.Build.0 = Release|x64 {A63E9DF9-1D47-4D81-834C-1D40406C18C4}.Debug|Any CPU.ActiveCfg = Debug|Win32 {A63E9DF9-1D47-4D81-834C-1D40406C18C4}.Debug|Any CPU.Build.0 = Debug|Win32 - {A63E9DF9-1D47-4D81-834C-1D40406C18C4}.Debug|Win32.ActiveCfg = Debug MD|Win32 - {A63E9DF9-1D47-4D81-834C-1D40406C18C4}.Debug|Win32.Build.0 = Debug MD|Win32 + {A63E9DF9-1D47-4D81-834C-1D40406C18C4}.Debug|Win32.ActiveCfg = Debug|Win32 + {A63E9DF9-1D47-4D81-834C-1D40406C18C4}.Debug|Win32.Build.0 = Debug|Win32 {A63E9DF9-1D47-4D81-834C-1D40406C18C4}.Debug|x64.ActiveCfg = Debug|x64 {A63E9DF9-1D47-4D81-834C-1D40406C18C4}.Debug|x64.Build.0 = Debug|x64 {A63E9DF9-1D47-4D81-834C-1D40406C18C4}.Release|Any CPU.ActiveCfg = Release|Win32 @@ -210,8 +210,8 @@ Global {A63E9DF9-1D47-4D81-834C-1D40406C18C4}.Release|x64.Build.0 = Release|x64 {7CC01C3D-FC1A-4587-868A-7FC4449B3F8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7CC01C3D-FC1A-4587-868A-7FC4449B3F8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CC01C3D-FC1A-4587-868A-7FC4449B3F8B}.Debug|Win32.ActiveCfg = Debug MD|Any CPU - {7CC01C3D-FC1A-4587-868A-7FC4449B3F8B}.Debug|Win32.Build.0 = Debug MD|Any CPU + {7CC01C3D-FC1A-4587-868A-7FC4449B3F8B}.Debug|Win32.ActiveCfg = Debug|Any CPU + {7CC01C3D-FC1A-4587-868A-7FC4449B3F8B}.Debug|Win32.Build.0 = Debug|Any CPU {7CC01C3D-FC1A-4587-868A-7FC4449B3F8B}.Debug|x64.ActiveCfg = Debug|Any CPU {7CC01C3D-FC1A-4587-868A-7FC4449B3F8B}.Debug|x64.Build.0 = Debug|Any CPU {7CC01C3D-FC1A-4587-868A-7FC4449B3F8B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -222,8 +222,8 @@ Global {7CC01C3D-FC1A-4587-868A-7FC4449B3F8B}.Release|x64.Build.0 = Release|Any CPU {F14B75D8-3ED7-4621-B5B9-E96A80B5D809}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F14B75D8-3ED7-4621-B5B9-E96A80B5D809}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F14B75D8-3ED7-4621-B5B9-E96A80B5D809}.Debug|Win32.ActiveCfg = Debug MD|Any CPU - {F14B75D8-3ED7-4621-B5B9-E96A80B5D809}.Debug|Win32.Build.0 = Debug MD|Any CPU + {F14B75D8-3ED7-4621-B5B9-E96A80B5D809}.Debug|Win32.ActiveCfg = Debug|Any CPU + {F14B75D8-3ED7-4621-B5B9-E96A80B5D809}.Debug|Win32.Build.0 = Debug|Any CPU {F14B75D8-3ED7-4621-B5B9-E96A80B5D809}.Debug|x64.ActiveCfg = Debug|Any CPU {F14B75D8-3ED7-4621-B5B9-E96A80B5D809}.Debug|x64.Build.0 = Debug|Any CPU {F14B75D8-3ED7-4621-B5B9-E96A80B5D809}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/ase/awk/aseawk++.vcproj b/ase/awk/aseawk++.vcproj index 4fa7d223..1cf893c3 100644 --- a/ase/awk/aseawk++.vcproj +++ b/ase/awk/aseawk++.vcproj @@ -157,77 +157,6 @@ Name="VCPostBuildEventTool" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -471,15 +328,6 @@ PreprocessorDefinitions="" /> - - - @@ -498,15 +346,6 @@ PreprocessorDefinitions="" /> - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -462,24 +319,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -490,7 +329,7 @@ /> - - - - - - @@ -548,7 +369,7 @@ /> - - - - - - @@ -606,7 +409,7 @@ /> - - - - - - @@ -664,7 +449,7 @@ /> - - - - - - @@ -722,7 +489,7 @@ /> - - - - - - @@ -780,7 +529,7 @@ /> - - - - - - @@ -838,7 +569,7 @@ /> - - - - - - @@ -896,7 +609,7 @@ /> - - - - - - @@ -954,7 +649,7 @@ /> - - - - - - @@ -1012,7 +689,7 @@ /> - - - - - - @@ -1070,7 +729,7 @@ /> - - - - - - @@ -1128,7 +769,7 @@ /> - - - - - - @@ -1186,7 +809,7 @@ /> + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -574,24 +393,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -602,7 +403,7 @@ /> errmsg)]; ase_size_t len, tl; diff --git a/ase/awk/msw-cl.mak b/ase/awk/msw-cl.mak index 1f637030..8ddfd706 100644 --- a/ase/awk/msw-cl.mak +++ b/ase/awk/msw-cl.mak @@ -5,6 +5,14 @@ JNI_INC = \ -I"$(JAVA_HOME)\include" \ -I"$(JAVA_HOME)\include\win32" +!if !defined(CPU) || "$(CPU)" == "" +CPU = $(PROCESSOR_ARCHITECTURE) +!endif + +!if "$(CPU)" == "" +CPU = i386 +!endif + CC = cl CXX = cl LD = link @@ -18,6 +26,7 @@ JAVACFLAGS = -classpath ..\.. -Xlint:unchecked #LDFLAGS = /subsystem:console LDFLAGS = /subsystem:windows +LIBS= !IF "$(MODE)" == "debug" CFLAGS = $(CFLAGS) -D_DEBUG -DDEBUG /MTd @@ -74,7 +83,22 @@ OBJ_FILES_JAR = \ $(TMP_DIR)\ase\awk\Pipe.class \ $(TMP_DIR)\ase\awk\Exception.class -all: lib +LIBS_JNIDLL=user32.lib $(OUT_FILE_LIB) asecmn.lib aseutl.lib + +!if "$(CPU)" == "IA64" || "$(CPU)" == "AMD64" +# comment out the following line if you encounter this link error. +# LINK : fatal error LNK1181: cannot open input file 'bufferoverflowu.lib' +LIBS_JNIDLL = $(LIBS_JNIDLL) bufferoverflowu.lib +!endif + + +TARGETS = lib + +!if "$(JAVA_HOME)" != "" +TARGETS = $(TARGETS) jnidll jar +!endif + +all: $(TARGETS) lib: $(OUT_FILE_LIB) $(OUT_FILE_LIB_CXX) @@ -94,7 +118,7 @@ $(OUT_FILE_LIB_CXX): $(TMP_DIR_CXX) $(OUT_FILE_LIB) $(OBJ_FILES_LIB_CXX) $(OUT_FILE_JNI): $(OUT_FILE_LIB) $(OBJ_FILES_JNI) $(LD) /dll /def:jni.def $(LDFLAGS) /release @<< -/nologo /out:$(OUT_FILE_JNI) $(OBJ_FILES_JNI) /libpath:../$(MODE)/lib /implib:tmp.lib user32.lib $(OUT_FILE_LIB) asecmn.lib aseutl.lib +/nologo /out:$(OUT_FILE_JNI) $(OBJ_FILES_JNI) /libpath:../$(MODE)/lib /implib:tmp.lib $(LIBS_JNIDLL) << del tmp.lib tmp.exp diff --git a/ase/change.log b/ase/change.log index e94f4c43..9a788031 100644 --- a/ase/change.log +++ b/ase/change.log @@ -7,7 +7,6 @@ - added Awk::AddGlobal, Awk::DeleteGlobal (net/Awk.hpp, net/Awk.cpp) - added Awk::Run::SetGlobal, Awk::Run::GetGlobal (net/Awk.hpp, net/Awk.cpp) - enhanced ase_awk_getglobalname - - yet to be added to the COM and JNI bindings. * added three new options - ASE_AWK_RESET, ASE_AWK_MAPTOVAR, ASE_AWK_PABLOCK * enhanced Awk::dispatchFunction to set a more accurate error code (awk/Awk.cpp) @@ -25,6 +24,7 @@ respectively. * started the source code documentation of awk/Awk.hpp. +* enhanded test programs. [0.3.0] diff --git a/ase/cmn/asecmn.vcproj b/ase/cmn/asecmn.vcproj index 525d79d1..103e1e32 100644 --- a/ase/cmn/asecmn.vcproj +++ b/ase/cmn/asecmn.vcproj @@ -155,76 +155,6 @@ Name="VCPostBuildEventTool" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -465,15 +324,6 @@ PreprocessorDefinitions="" /> - - - @@ -492,15 +342,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -550,15 +382,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -608,15 +422,6 @@ PreprocessorDefinitions="" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -650,15 +447,6 @@ PreprocessorDefinitions="" /> - - - @@ -677,15 +465,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -749,17 +517,6 @@ InterfaceIdentifierFileName="asecom_i.c" /> - - - - - - @@ -809,15 +557,6 @@ AdditionalIncludeDirectories="$(OUTDIR)" /> - - - - - - @@ -867,15 +597,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -925,15 +637,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -983,15 +677,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -1046,16 +721,6 @@ UsePrecompiledHeader="1" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -459,15 +320,6 @@ PreprocessorDefinitions="" /> - - - @@ -486,15 +338,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -544,15 +378,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -602,15 +418,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -660,15 +458,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -718,15 +498,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -776,15 +538,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -834,15 +578,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -892,15 +618,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -950,15 +658,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -1008,15 +698,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -1066,15 +738,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -1124,15 +778,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -1182,15 +818,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -1240,15 +858,6 @@ PreprocessorDefinitions="" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -547,14 +386,6 @@ UsePrecompiledHeader="1" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -585,15 +404,6 @@ PreprocessorDefinitions="" /> - - - @@ -612,15 +422,6 @@ PreprocessorDefinitions="" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - diff --git a/ase/test/awk/err-009.awk b/ase/test/awk/err-009.awk index b90f55fb..5957d2e9 100644 --- a/ase/test/awk/err-009.awk +++ b/ase/test/awk/err-009.awk @@ -1,5 +1,5 @@ -func abc () +function abc () { local x; diff --git a/ase/test/awk/err-010.awk b/ase/test/awk/err-010.awk index e59a23f3..fd67e865 100644 --- a/ase/test/awk/err-010.awk +++ b/ase/test/awk/err-010.awk @@ -1,7 +1,7 @@ global abc; -func abc () +function abc () { local abc; diff --git a/ase/test/awk/err-011.awk b/ase/test/awk/err-011.awk index d8dd77ea..d39708d8 100644 --- a/ase/test/awk/err-011.awk +++ b/ase/test/awk/err-011.awk @@ -1,5 +1,5 @@ -func abc (x) +function abc (x) { local x; diff --git a/ase/test/awk/err-012.awk b/ase/test/awk/err-012.awk index 3382d7ed..059c8d55 100644 --- a/ase/test/awk/err-012.awk +++ b/ase/test/awk/err-012.awk @@ -1,5 +1,5 @@ -func abc () +function abc () { local j ; diff --git a/ase/test/awk/err-013.awk b/ase/test/awk/err-013.awk index 2acc1f7d..1b53c80f 100644 --- a/ase/test/awk/err-013.awk +++ b/ase/test/awk/err-013.awk @@ -1,3 +1,3 @@ -func abc (abc) +function abc (abc) { } diff --git a/ase/test/awk/err-017.awk b/ase/test/awk/err-017.awk index 883b72c7..8838df83 100644 --- a/ase/test/awk/err-017.awk +++ b/ase/test/awk/err-017.awk @@ -1 +1 @@ -func abc (+) {} +function abc (+) {} diff --git a/ase/test/awk/msw-cl.mak b/ase/test/awk/msw-cl.mak index c0860df6..254638e6 100644 --- a/ase/test/awk/msw-cl.mak +++ b/ase/test/awk/msw-cl.mak @@ -4,9 +4,12 @@ MODE = release CC = cl CXX = cl LD = link +JAVAC = javac +JAR = jar CFLAGS = /nologo /W3 -I..\..\.. CXXFLAGS = /nologo /W3 -I..\..\.. +JAVACFLAGS = -classpath ..\..\$(MODE)\lib\aseawk.jar;. -Xlint:unchecked LDFLAGS = /libpath:..\..\$(MODE)\lib LIBS = asecmn.lib aseawk.lib aseutl.lib kernel32.lib user32.lib @@ -40,29 +43,59 @@ LIBS = $(LIBS) bufferoverflowu.lib OUT_DIR = ..\..\$(MODE)\bin OUT_FILE_BIN = $(OUT_DIR)\$(NAME).exe OUT_FILE_BIN_CXX = $(OUT_DIR)\$(NAME)++.exe +OUT_FILE_JAR = $(OUT_DIR)\$(NAME).jar TMP_DIR = $(MODE) TMP_DIR_CXX = $(TMP_DIR)\cxx +TMP_DIR_JAR = $(TMP_DIR)\java OBJ_FILES_BIN = $(TMP_DIR)\awk.obj OBJ_FILES_BIN_CXX = $(TMP_DIR_CXX)\Awk.obj -all: bin +OBJ_FILES_JAR = \ + $(TMP_DIR_JAR)\AseAwk.class \ + $(TMP_DIR_JAR)\AseAwkPanel.class \ + $(TMP_DIR_JAR)\AseAwkApplet.class + +TARGETS = bin + +!if "$(JAVA_HOME)" != "" +TARGETS = $(TARGETS) jar +!endif + + +all: $(TARGETS) bin: $(OUT_FILE_BIN) $(OUT_FILE_BIN_CXX) +jar: $(OUT_FILE_JAR) + + $(OUT_FILE_BIN): $(TMP_DIR) $(OUT_DIR) $(OBJ_FILES_BIN) $(LD) /nologo /out:$@ $(LDFLAGS) $(LIBS) $(OBJ_FILES_BIN) $(OUT_FILE_BIN_CXX): $(TMP_DIR_CXX) $(OUT_FILE_BIN) $(OBJ_FILES_BIN_CXX) $(LD) /nologo /out:$@ $(LDFLAGS) $(LIBS_CXX) $(OBJ_FILES_BIN_CXX) +$(OUT_FILE_JAR): $(TMP_DIR_JAR) $(OBJ_FILES_JAR) + $(JAR) -xvf ..\..\$(MODE)\lib\aseawk.jar + $(JAR) -cvfm $(OUT_FILE_JAR) manifest ase -C $(TMP_DIR_JAR) . + $(TMP_DIR)\awk.obj: awk.c $(CC) $(CFLAGS) /Fo$@ /c awk.c $(TMP_DIR_CXX)\Awk.obj: Awk.cpp $(CC) $(CXXFLAGS) /Fo$@ /c Awk.cpp +$(TMP_DIR_JAR)\AseAwk.class: AseAwk.java + $(JAVAC) $(JAVACFLAGS) -d $(TMP_DIR_JAR) AseAwk.java + +$(TMP_DIR_JAR)\AseAwkApplet.class: AseAwkApplet.java + $(JAVAC) $(JAVACFLAGS) -d $(TMP_DIR_JAR) AseAwkApplet.java + +$(TMP_DIR_JAR)\AseAwkPanel.class: AseAwkPanel.java + $(JAVAC) $(JAVACFLAGS) -d $(TMP_DIR_JAR) AseAwkPanel.java + $(OUT_DIR): -md $(OUT_DIR) @@ -72,9 +105,14 @@ $(TMP_DIR): $(TMP_DIR_CXX): $(TMP_DIR) -md $(TMP_DIR_CXX) +$(TMP_DIR_JAR): $(TMP_DIR) + -md $(TMP_DIR_JAR) + clean: -del $(OUT_FILE_BIN) -del $(OUT_FILE_BIN_CXX) -del $(OBJ_FILES_BIN) -del $(OBJ_FILES_BIN_CXX) - + -del $(OUT_FILE_JAR) + -del $(OBJ_FILES_JAR) + -del $(TMP_DIR)\*.class diff --git a/ase/test/awk/t1.awk b/ase/test/awk/t1.awk index 8aaacc2f..9cffc875 100644 --- a/ase/test/awk/t1.awk +++ b/ase/test/awk/t1.awk @@ -1,4 +1,4 @@ -func sum(i, k, y) +function sum(i, k, y) { y = 0; for (k = i; k; k = k - 1) diff --git a/ase/test/awk/t3.awk b/ase/test/awk/t3.awk index eb13d37d..13453cb2 100644 --- a/ase/test/awk/t3.awk +++ b/ase/test/awk/t3.awk @@ -1,6 +1,6 @@ #global x, j; -func func1 (x) +function func1 (x) { c = x["abc"]; x["abc"] = 123; diff --git a/ase/test/com/asecom.csproj b/ase/test/com/asecom.csproj index e580ea5f..ad65d3c8 100644 --- a/ase/test/com/asecom.csproj +++ b/ase/test/com/asecom.csproj @@ -28,14 +28,6 @@ prompt 4 - - true - bin\Debug MD\ - DEBUG;TRACE - full - AnyCPU - prompt - true bin\x64\Debug\ @@ -52,14 +44,6 @@ x64 prompt - - true - bin\x64\Debug MD\ - DEBUG;TRACE - full - x64 - prompt - @@ -121,4 +105,4 @@ --> - \ No newline at end of file + diff --git a/ase/test/lsp/aselsp.vcproj b/ase/test/lsp/aselsp.vcproj index 7b07c72e..3a0b8f42 100644 --- a/ase/test/lsp/aselsp.vcproj +++ b/ase/test/lsp/aselsp.vcproj @@ -193,95 +193,6 @@ Name="VCPostBuildEventTool" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -579,15 +400,6 @@ PreprocessorDefinitions="" /> - - - @@ -606,15 +418,6 @@ PreprocessorDefinitions="" /> - - - prompt 4 - - true - bin\Debug MD\ - DEBUG;TRACE - full - AnyCPU - prompt - true bin\x64\Debug\ @@ -51,14 +43,6 @@ x64 prompt - - true - bin\x64\Debug MD\ - DEBUG;TRACE - full - x64 - prompt - @@ -115,4 +99,4 @@ --> - \ No newline at end of file + diff --git a/ase/utl/aseutl.vcproj b/ase/utl/aseutl.vcproj index 81ae5d03..9acdc90b 100644 --- a/ase/utl/aseutl.vcproj +++ b/ase/utl/aseutl.vcproj @@ -155,76 +155,6 @@ Name="VCPostBuildEventTool" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -465,15 +324,6 @@ PreprocessorDefinitions="" /> - - - @@ -492,15 +342,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -550,15 +382,6 @@ PreprocessorDefinitions="" /> - - - - - - @@ -608,15 +422,6 @@ PreprocessorDefinitions="" /> - - -