cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename jsonCompiler to libsolc

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-09-16 03:50:16 +01:00
parent 27f38fb5b3
commit 1734d44561
11 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -43,9 +43,10 @@ configure_project(TESTS)
add_subdirectory(libdevcore) add_subdirectory(libdevcore)
add_subdirectory(libevmasm) add_subdirectory(libevmasm)
add_subdirectory(libsolidity) add_subdirectory(libsolidity)
add_subdirectory(solc) add_subdirectory(libsolc)
if (NOT EMSCRIPTEN) if (NOT EMSCRIPTEN)
add_subdirectory(solc)
add_subdirectory(liblll) add_subdirectory(liblll)
add_subdirectory(lllc) add_subdirectory(lllc)
endif() endif()

9
libsolc/CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
if (EMSCRIPTEN)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s EXPORTED_FUNCTIONS='[\"_compileJSON\",\"_license\",\"_version\",\"_compileJSONMulti\",\"_compileJSONCallback\",\"_compileStandard\"]' -s RESERVED_FUNCTION_POINTERS=20")
add_executable(soljson libsolc.cpp)
target_link_libraries(soljson PRIVATE solidity)
else()
add_library(libsolc libsolc.cpp)
set_target_properties(libsolc PROPERTIES OUTPUT_NAME solc)
target_link_libraries(libsolc PRIVATE solidity)
endif()

2
solc/jsonCompiler.cpp → libsolc/libsolc.cpp
View File

@ -20,7 +20,7 @@
* JSON interface for the solidity compiler to be used from Javascript. * JSON interface for the solidity compiler to be used from Javascript.
*/ */
#include <solc/jsonCompiler.h> #include <libsolc/libsolc.h>
#include <libdevcore/Common.h> #include <libdevcore/Common.h>
#include <libdevcore/JSON.h> #include <libdevcore/JSON.h>
#include <libsolidity/interface/StandardCompiler.h> #include <libsolidity/interface/StandardCompiler.h>

0
solc/jsonCompiler.h → libsolc/libsolc.h
View File

2
scripts/bytecodecompare/storebytecode.sh
View File

@ -40,7 +40,7 @@ TMPDIR=$(mktemp -d)
if [[ "$SOLC_EMSCRIPTEN" = "On" ]] if [[ "$SOLC_EMSCRIPTEN" = "On" ]]
then then
cp "$REPO_ROOT/build/solc/soljson.js" . cp "$REPO_ROOT/build/libsolc/soljson.js" .
npm install solc npm install solc
cat > solc <<EOF cat > solc <<EOF
#!/usr/bin/env node #!/usr/bin/env node

2
scripts/test_emscripten.sh
View File

@ -29,7 +29,7 @@
set -e set -e
REPO_ROOT=$(cd $(dirname "$0")/.. && pwd) REPO_ROOT=$(cd $(dirname "$0")/.. && pwd)
SOLJSON="$REPO_ROOT/build/solc/soljson.js" SOLJSON="$REPO_ROOT/build/libsolc/soljson.js"
DIR=$(mktemp -d) DIR=$(mktemp -d)
( (

4
scripts/travis-emscripten/build_emscripten.sh
View File

@ -87,8 +87,8 @@ make -j 4
cd .. cd ..
mkdir -p upload mkdir -p upload
cp build/solc/soljson.js upload/ cp build/libsolc/soljson.js upload/
cp build/solc/soljson.js ./ cp build/libsolc/soljson.js ./
OUTPUT_SIZE=`ls -la soljson.js` OUTPUT_SIZE=`ls -la soljson.js`

8
solc/CMakeLists.txt
View File

@ -10,14 +10,6 @@ target_link_libraries(solc PRIVATE solidity ${Boost_PROGRAM_OPTIONS_LIBRARIES})
include(GNUInstallDirs) include(GNUInstallDirs)
install(TARGETS solc DESTINATION "${CMAKE_INSTALL_BINDIR}") install(TARGETS solc DESTINATION "${CMAKE_INSTALL_BINDIR}")
if (EMSCRIPTEN)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s EXPORTED_FUNCTIONS='[\"_compileJSON\",\"_license\",\"_version\",\"_compileJSONMulti\",\"_compileJSONCallback\",\"_compileStandard\"]' -s RESERVED_FUNCTION_POINTERS=20")
add_executable(soljson jsonCompiler.cpp)
else()
add_library(soljson jsonCompiler.cpp)
endif()
target_link_libraries(soljson PRIVATE solidity)
if(SOLC_LINK_STATIC AND UNIX AND NOT APPLE) if(SOLC_LINK_STATIC AND UNIX AND NOT APPLE)
# Produce solc as statically linked binary (includes C/C++ standard libraries) # Produce solc as statically linked binary (includes C/C++ standard libraries)
# This is not supported on macOS, see # This is not supported on macOS, see

4
test/CMakeLists.txt
View File

@ -3,7 +3,7 @@ list(REMOVE_ITEM sources "${CMAKE_CURRENT_SOURCE_DIR}/fuzzer.cpp")
file(GLOB_RECURSE headers "*.h") file(GLOB_RECURSE headers "*.h")
add_executable(soltest ${sources} ${headers}) add_executable(soltest ${sources} ${headers})
target_link_libraries(soltest PRIVATE soljson solidity lll evmasm devcore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES}) target_link_libraries(soltest PRIVATE libsolc solidity lll evmasm devcore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
add_executable(solfuzzer fuzzer.cpp) add_executable(solfuzzer fuzzer.cpp)
target_link_libraries(solfuzzer soljson evmasm ${Boost_PROGRAM_OPTIONS_LIBRARIES}) target_link_libraries(solfuzzer PRIVATE libsolc evmasm ${Boost_PROGRAM_OPTIONS_LIBRARIES})

2
test/fuzzer.cpp
View File

@ -20,7 +20,7 @@
#include <libevmasm/Assembly.h> #include <libevmasm/Assembly.h>
#include <libevmasm/ConstantOptimiser.h> #include <libevmasm/ConstantOptimiser.h>
#include <solc/jsonCompiler.h> #include <libsolc/libsolc.h>
#include <json/json.h> #include <json/json.h>

2
test/libsolidity/JSONCompiler.cpp
View File

@ -23,7 +23,7 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <libdevcore/JSON.h> #include <libdevcore/JSON.h>
#include <libsolidity/interface/Version.h> #include <libsolidity/interface/Version.h>
#include <solc/jsonCompiler.h> #include <libsolc/libsolc.h>
#include "../Metadata.h" #include "../Metadata.h"
#include "../TestHelper.h" #include "../TestHelper.h"