build related update
This commit is contained in:
parent
d275be643c
commit
b0b0956275
|
|
@ -27,6 +27,18 @@
|
||||||
"environment": [],
|
"environment": [],
|
||||||
"console": "externalTerminal",
|
"console": "externalTerminal",
|
||||||
"MIMode": "lldb"
|
"MIMode": "lldb"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ml -d -f tests/test.lsp",
|
||||||
|
"type": "cppdbg",
|
||||||
|
"request": "launch",
|
||||||
|
"program": "${workspaceFolder}/build/ml",
|
||||||
|
"args": ["-d", "-f", "${workspaceFolder}/tests/test.lsp"],
|
||||||
|
"stopAtEntry": false,
|
||||||
|
"cwd": "${workspaceFolder}",
|
||||||
|
"environment": [],
|
||||||
|
"console": "externalTerminal",
|
||||||
|
"MIMode": "lldb"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -46,7 +46,6 @@ set(SOURCE
|
||||||
usql/usql_ddl.cpp
|
usql/usql_ddl.cpp
|
||||||
usql/usql_function.cpp
|
usql/usql_function.cpp
|
||||||
usql/table.cpp
|
usql/table.cpp
|
||||||
usql/table.h
|
|
||||||
usql/row.cpp
|
usql/row.cpp
|
||||||
usql/csvreader.cpp
|
usql/csvreader.cpp
|
||||||
usql/settings.cpp
|
usql/settings.cpp
|
||||||
|
|
@ -54,7 +53,7 @@ set(SOURCE
|
||||||
|
|
||||||
add_executable(${PROJECT_NAME} ${SOURCE})
|
add_executable(${PROJECT_NAME} ${SOURCE})
|
||||||
|
|
||||||
target_link_libraries(${PROJECT_NAME} stdc++ m ssl crypto)
|
target_link_libraries(${PROJECT_NAME} stdc++ m ssl crypto pthread)
|
||||||
|
|
||||||
set(CMAKE_INSTALL_PREFIX "/usr/local")
|
set(CMAKE_INSTALL_PREFIX "/usr/local")
|
||||||
INSTALL(TARGETS ml
|
INSTALL(TARGETS ml
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,10 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
gcc -std=c99 -c -O2 -o linenoise.o clib/linenoise.c
|
gcc -std=c99 -c -O3 -o linenoise.o clib/linenoise.c
|
||||||
c++ -c -O2 -I/usr/local/opt/openssl/include -Iclib -I./ --std=c++17 ml.cpp ml_io.cpp ml_date.cpp ml_string.cpp ml_util.cpp ml_profiler.cpp ml_usql.cpp clib/json11.cpp clib/csvparser.cpp clib/sslclient.cpp clib/tcpnet.cpp clib/printf.cpp usql/exception.cpp usql/lexer.cpp usql/parser.cpp usql/usql.cpp usql/table.cpp usql/table.h usql/row.cpp usql/csvreader.cpp usql/usql.cpp usql/usql_ddl.cpp usql/usql_dml.cpp usql/usql_function.cpp usql/settings.cpp
|
c++ -c -O3 -I/usr/local/opt/openssl/include -Iclib -I./ --std=c++17 -pthread ml.cpp ml_io.cpp ml_date.cpp ml_string.cpp ml_util.cpp ml_profiler.cpp ml_usql.cpp clib/json11.cpp clib/csvparser.cpp clib/sslclient.cpp clib/tcpnet.cpp clib/printf.cpp usql/exception.cpp usql/lexer.cpp usql/parser.cpp usql/usql.cpp usql/table.cpp usql/row.cpp usql/csvreader.cpp usql/usql.cpp usql/usql_ddl.cpp usql/usql_dml.cpp usql/usql_function.cpp usql/settings.cpp
|
||||||
c++ -o ml -O2 -L/usr/local/lib -L/usr/local/opt/openssl/lib -lm -lstdc++ -lcrypto -lssl *.o
|
c++ -o ml -O3 -pthread -L/usr/local/lib -L/usr/local/opt/openssl/lib -L/lib/x86_64-linux-gnu -lm -lstdc++ -lcrypto -lssl -lpthread *.o
|
||||||
|
|
||||||
|
mkdir -p /usr/local/var/mlisp
|
||||||
cp stdlib/*.lsp /usr/local/var/mlisp/
|
cp stdlib/*.lsp /usr/local/var/mlisp/
|
||||||
cp ml /usr/local/bin/ml
|
cp ml /usr/local/bin/ml
|
||||||
|
|
||||||
|
|
@ -11,7 +12,7 @@ rm *.o
|
||||||
rm ./ml
|
rm ./ml
|
||||||
|
|
||||||
echo "if syntax has changed you may use"
|
echo "if syntax has changed you may use"
|
||||||
echo "cp utils/Lisp.tmLanguage ~/.vscode/extensions/mattn.lisp-0.1.11/syntaxes/"
|
echo "cp utils/Lisp.tmLanguage ~/.vscode/extensions/mattn.lisp-0.1.12/syntaxes/"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
ml -v
|
ml -v
|
||||||
|
|
@ -23,9 +23,9 @@ if [ "$#" -eq 1 ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Building ml"
|
echo "Building ml"
|
||||||
ssh -p 5333 root@46.28.109.184 "cd /tmp/mlisp; gcc -std=c99 -c -O2 -o linenoise.o clib/linenoise.c"
|
ssh -p 5333 root@46.28.109.184 "cd /tmp/mlisp; gcc -std=c99 -c -O3 -o linenoise.o clib/linenoise.c"
|
||||||
ssh -p 5333 root@46.28.109.184 "cd /tmp/mlisp; c++ -c -O2 -I/usr/local/opt/openssl/include -Iclib -I./ --std=c++17 ml.cpp ml_io.cpp ml_date.cpp ml_string.cpp ml_util.cpp ml_profiler.cpp ml_usql.cpp clib/json11.cpp clib/csvparser.cpp clib/sslclient.cpp clib/tcpnet.cpp clib/printf.cpp usql/exception.cpp usql/lexer.cpp usql/parser.cpp usql/usql.cpp usql/table.cpp usql/table.h usql/row.cpp usql/csvreader.cpp usql/usql.cpp usql/usql_ddl.cpp usql/usql_dml.cpp usql/usql_function.cpp usql/settings.cpp"
|
ssh -p 5333 root@46.28.109.184 "cd /tmp/mlisp; c++ -c -O3 -I/usr/local/opt/openssl/include -Iclib -I./ --std=c++17 ml.cpp ml_io.cpp ml_date.cpp ml_string.cpp ml_util.cpp ml_profiler.cpp ml_usql.cpp clib/json11.cpp clib/csvparser.cpp clib/sslclient.cpp clib/tcpnet.cpp clib/printf.cpp usql/exception.cpp usql/lexer.cpp usql/parser.cpp usql/usql.cpp usql/table.cpp usql/row.cpp usql/csvreader.cpp usql/usql.cpp usql/usql_ddl.cpp usql/usql_dml.cpp usql/usql_function.cpp usql/settings.cpp"
|
||||||
ssh -p 5333 root@46.28.109.184 "cd /tmp/mlisp; c++ -o ml -O2 -L/usr/local/lib -L/usr/local/opt/openssl/lib -lm -lstdc++ -lcrypto -lssl *.o"
|
ssh -p 5333 root@46.28.109.184 "cd /tmp/mlisp; c++ -o ml -O3 -L/usr/local/lib -L/usr/local/opt/openssl/lib -L/lib/x86_64-linux-gnu -lm -lstdc++ -lcrypto -lssl *.o"
|
||||||
|
|
||||||
|
|
||||||
echo "Installing new version"
|
echo "Installing new version"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue