Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Add in sim target, fix make targets

  • Loading branch information...
commit 329f4ed5c47ba3ad4da84b6528c426ff4565b402 1 parent f1f3dcf
@alamb alamb authored
View
10 web_package/Makefile
@@ -25,7 +25,7 @@ PACKAGE_LIBNAME = lib/WebPackage.so
CXX=g++
CXXFLAGS=-g -D HAVE_LONG_LONG_INT_64 -c -I ../include -Wall -Wno-unused-value -fPIC -I $(VERTICA_SDK_INCLUDE) -I $(THIRD_PARTY_INCLUDE)
-LDFLAGS=-shared -L $(THIRD_PARTY_LIB) -Wl,-Bstatic -luriparser -Wl,-Bdynamic
+LDFLAGS=-shared -L $(THIRD_PARTY_LIB) -Wl,-Bstatic -luriparser -Wl,-Bstatic -lpcre -Wl,-Bdynamic
# add optimization if not a debug build
# (make DEBUG=true" will make a non-optimized build)
@@ -86,9 +86,11 @@ DEBUG_DATA_PATH = $(shell pwd)/test-data
# Run the simulator against the functons
# Run the simulator against the functons
sim_test: all simulator
- $(VALGRIND) ./vsim $(PACKAGE_LIBNAME) ApacheParserFactory $(DEBUG_DATA_PATH)/apache.txt
- $(VALGRIND) ./vsim $(PACKAGE_LIBNAME) UriExtractorFactory $(DEBUG_DATA_PATH)/urls.txt
- $(VALGRIND) ./vsim $(PACKAGE_LIBNAME) w3cLogParserFactory $(DEBUG_DATA_PATH)/iis.txt
+ $(VALGRIND) ./vsim $(PACKAGE_LIBNAME) ApacheParserFactory $(DEBUG_DATA_PATH)/apache.txt
+ $(VALGRIND) ./vsim $(PACKAGE_LIBNAME) UriExtractorFactory $(DEBUG_DATA_PATH)/urls.txt
+ $(VALGRIND) ./vsim $(PACKAGE_LIBNAME) w3cLogParserFactory $(DEBUG_DATA_PATH)/iis.txt
+ $(VALGRIND) ./vsim $(PACKAGE_LIBNAME) EmailValidatorFactory $(DEBUG_DATA_PATH)/email_addresses.txt
+
# build the simulator (in SIMULATOR_PATH) and simlink it here
simulator:
View
1  web_package/src/third-party/makefile
@@ -55,6 +55,7 @@ $(PCRE_DIR)/.done:
(cd $(PCRE_DIR); $(TAR) xjf $(PCRE_TBZ) )
(cd $(PCRE_SRC); ./configure --prefix=$(INSTALL_DIR) )
(cd $(PCRE_SRC); make; make install)
+ touch $@
# download pcre from sourceforge
pcre-8.10.tar.bz2:
View
5 web_package/test-data/email_addresses.txt
@@ -0,0 +1,5 @@
+email:string
+abc@xyz.com
+www.hp.com
+3e1*@VerticaCorp.com
+me@VerticaCorp.com
Please sign in to comment.
Something went wrong with that request. Please try again.