Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OS/X Scons changes. #333

Closed
wants to merge 5 commits into from
Closed

OS/X Scons changes. #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae28ab3
Tidy up some source filenames:
vinniefalco Apr 22, 2014
e1c8654
[WIP] Beast SCons tools:
vinniefalco Apr 25, 2014
2c4ec2e
[WIP] improved rippled SConstruct
vinniefalco Apr 26, 2014
c07dc66
[FOLD] rippled SConstruct
vinniefalco Apr 27, 2014
c7dca5f
Fix scons build to work on OS/X
rec Apr 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions Builds/QtCreator/rippled.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,42 +62,42 @@ UI_HEADERS_DIR += ../../src/ripple_basics
# New style
#
SOURCES += \
../../src/ripple/beast/ripple_beast.cpp \
../../src/ripple/beast/ripple_beast.unity.cpp \
../../src/ripple/beast/ripple_beastc.c \
../../src/ripple/common/ripple_common.cpp \
../../src/ripple/http/ripple_http.cpp \
../../src/ripple/json/ripple_json.cpp \
../../src/ripple/peerfinder/ripple_peerfinder.cpp \
../../src/ripple/radmap/ripple_radmap.cpp \
../../src/ripple/resource/ripple_resource.cpp \
../../src/ripple/sitefiles/ripple_sitefiles.cpp \
../../src/ripple/sslutil/ripple_sslutil.cpp \
../../src/ripple/testoverlay/ripple_testoverlay.cpp \
../../src/ripple/types/ripple_types.cpp \
../../src/ripple/validators/ripple_validators.cpp
../../src/ripple/common/ripple_common.unity.cpp \
../../src/ripple/http/ripple_http.unity.cpp \
../../src/ripple/json/ripple_json.unity.cpp \
../../src/ripple/peerfinder/ripple_peerfinder.unity.cpp \
../../src/ripple/radmap/ripple_radmap.unity.cpp \
../../src/ripple/resource/ripple_resource.unity.cpp \
../../src/ripple/sitefiles/ripple_sitefiles.unity.cpp \
../../src/ripple/sslutil/ripple_sslutil.unity.cpp \
../../src/ripple/testoverlay/ripple_testoverlay.unity.cpp \
../../src/ripple/types/ripple_types.unity.cpp \
../../src/ripple/validators/ripple_validators.unity.cpp

# ---------
# Old style
#
SOURCES += \
../../src/ripple_app/ripple_app.cpp \
../../src/ripple_app/ripple_app_pt1.cpp \
../../src/ripple_app/ripple_app_pt2.cpp \
../../src/ripple_app/ripple_app_pt3.cpp \
../../src/ripple_app/ripple_app_pt4.cpp \
../../src/ripple_app/ripple_app_pt5.cpp \
../../src/ripple_app/ripple_app_pt6.cpp \
../../src/ripple_app/ripple_app_pt7.cpp \
../../src/ripple_app/ripple_app_pt8.cpp \
../../src/ripple_basics/ripple_basics.cpp \
../../src/ripple_core/ripple_core.cpp \
../../src/ripple_data/ripple_data.cpp \
../../src/ripple_hyperleveldb/ripple_hyperleveldb.cpp \
../../src/ripple_leveldb/ripple_leveldb.cpp \
../../src/ripple_net/ripple_net.cpp \
../../src/ripple_overlay/ripple_overlay.cpp \
../../src/ripple_rpc/ripple_rpc.cpp \
../../src/ripple_websocket/ripple_websocket.cpp
../../src/ripple_app/ripple_app.unity.cpp \
../../src/ripple_app/ripple_app_pt1.unity.cpp \
../../src/ripple_app/ripple_app_pt2.unity.cpp \
../../src/ripple_app/ripple_app_pt3.unity.cpp \
../../src/ripple_app/ripple_app_pt4.unity.cpp \
../../src/ripple_app/ripple_app_pt5.unity.cpp \
../../src/ripple_app/ripple_app_pt6.unity.cpp \
../../src/ripple_app/ripple_app_pt7.unity.cpp \
../../src/ripple_app/ripple_app_pt8.unity.cpp \
../../src/ripple_basics/ripple_basics.unity.cpp \
../../src/ripple_core/ripple_core.unity.cpp \
../../src/ripple_data/ripple_data.unity.cpp \
../../src/ripple_hyperleveldb/ripple_hyperleveldb.unity.cpp \
../../src/ripple_leveldb/ripple_leveldb.unity.cpp \
../../src/ripple_net/ripple_net.unity.cpp \
../../src/ripple_overlay/ripple_overlay.unity.cpp \
../../src/ripple_rpc/ripple_rpc.unity.cpp \
../../src/ripple_websocket/ripple_websocket.unity.cpp

LIBS += \
-lboost_date_time-mt\
Expand Down
68 changes: 34 additions & 34 deletions Builds/VisualStudio2013/RippleD.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

204 changes: 102 additions & 102 deletions Builds/VisualStudio2013/RippleD.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,69 +855,9 @@
<ClCompile Include="..\..\src\ripple\validators\impl\StoreSqdb.cpp">
<Filter>[1] Ripple\validators\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\ripple_app.cpp">
<Filter>[2] Old Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\ripple_app_pt1.cpp">
<Filter>[2] Old Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\ripple_app_pt2.cpp">
<Filter>[2] Old Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\ripple_app_pt3.cpp">
<Filter>[2] Old Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\ripple_app_pt4.cpp">
<Filter>[2] Old Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\ripple_app_pt5.cpp">
<Filter>[2] Old Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\ripple_app_pt6.cpp">
<Filter>[2] Old Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\ripple_app_pt7.cpp">
<Filter>[2] Old Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\ripple_app_pt8.cpp">
<Filter>[2] Old Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\build\proto\ripple.pb.cc">
<Filter>[2] Old Ripple\ripple_data\protocol</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_basics\ripple_basics.cpp">
<Filter>[2] Old Ripple\ripple_basics</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_core\ripple_core.cpp">
<Filter>[2] Old Ripple\ripple_core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_data\ripple_data.cpp">
<Filter>[2] Old Ripple\ripple_data</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_hyperleveldb\ripple_hyperleveldb.cpp">
<Filter>[2] Old Ripple\ripple_hyperleveldb</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_net\ripple_net.cpp">
<Filter>[2] Old Ripple\ripple_net</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_websocket\ripple_websocket.cpp">
<Filter>[2] Old Ripple\ripple_websocket</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\validators\ripple_validators.cpp">
<Filter>[1] Ripple\validators</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\testoverlay\ripple_testoverlay.cpp">
<Filter>[1] Ripple\testoverlay</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_leveldb\ripple_leveldb.cpp">
<Filter>[2] Old Ripple\ripple_leveldb</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\beast\ripple_beast.cpp">
<Filter>[1] Ripple\beast</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\beast\ripple_beastc.c">
<Filter>[1] Ripple\beast</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\main\IoServicePool.cpp">
<Filter>[2] Old Ripple\ripple_app\main</Filter>
</ClCompile>
Expand All @@ -930,9 +870,6 @@
<ClCompile Include="..\..\src\ripple\json\impl\json_writer.cpp">
<Filter>[1] Ripple\json\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\json\ripple_json.cpp">
<Filter>[1] Ripple\json</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_core\nodestore\NodeStore.cpp">
<Filter>[2] Old Ripple\ripple_core\nodestore</Filter>
</ClCompile>
Expand Down Expand Up @@ -984,9 +921,6 @@
<ClCompile Include="..\..\src\ripple_app\main\RPCHTTPServer.cpp">
<Filter>[2] Old Ripple\ripple_app\main</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\http\ripple_http.cpp">
<Filter>[1] Ripple\http</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\http\impl\Server.cpp">
<Filter>[1] Ripple\http\impl</Filter>
</ClCompile>
Expand All @@ -999,15 +933,9 @@
<ClCompile Include="..\..\src\ripple\http\impl\ServerImpl.cpp">
<Filter>[1] Ripple\http\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\types\ripple_types.cpp">
<Filter>[1] Ripple\types</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\types\impl\Base58.cpp">
<Filter>[1] Ripple\types\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\sslutil\ripple_sslutil.cpp">
<Filter>[1] Ripple\sslutil</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\sslutil\impl\CBigNum.cpp">
<Filter>[1] Ripple\sslutil\impl</Filter>
</ClCompile>
Expand Down Expand Up @@ -1044,18 +972,12 @@
<ClCompile Include="..\..\src\ripple_core\functional\LoadFeeTrackImp.cpp">
<Filter>[2] Old Ripple\ripple_core\functional</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\peerfinder\ripple_peerfinder.cpp">
<Filter>[1] Ripple\peerfinder</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\json\impl\Tests.cpp">
<Filter>[1] Ripple\json\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\peerfinder\impl\Checker.cpp">
<Filter>[1] Ripple\peerfinder\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\resource\ripple_resource.cpp">
<Filter>[1] Ripple\resource</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\resource\impl\Charge.cpp">
<Filter>[1] Ripple\resource\impl</Filter>
</ClCompile>
Expand All @@ -1074,9 +996,6 @@
<ClCompile Include="..\..\src\ripple\resource\impl\LegacyFees.cpp">
<Filter>[1] Ripple\resource\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\sitefiles\ripple_sitefiles.cpp">
<Filter>[1] Ripple\sitefiles</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\sitefiles\impl\Section.cpp">
<Filter>[1] Ripple\sitefiles\impl</Filter>
</ClCompile>
Expand All @@ -1086,9 +1005,6 @@
<ClCompile Include="..\..\src\ripple\sitefiles\impl\Manager.cpp">
<Filter>[1] Ripple\sitefiles\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\rocksdb\ripple_rocksdb.cpp">
<Filter>[1] Ripple\rocksdb</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\rocksdb\rocksdb\db\builder.cc">
<Filter>[1] Ripple\rocksdb\rocksdb\db</Filter>
</ClCompile>
Expand Down Expand Up @@ -1320,9 +1236,6 @@
<ClCompile Include="..\..\src\ripple\types\impl\RippleAssets.cpp">
<Filter>[1] Ripple\types\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\common\ripple_common.cpp">
<Filter>[1] Ripple\common</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_core\nodestore\backend\RocksDBFactory.cpp">
<Filter>[2] Old Ripple\ripple_core\nodestore\backend</Filter>
</ClCompile>
Expand Down Expand Up @@ -1359,9 +1272,6 @@
<ClCompile Include="..\..\src\ripple_app\ledger\DirectoryEntryIterator.cpp">
<Filter>[2] Old Ripple\ripple_app\ledger</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\radmap\ripple_radmap.cpp">
<Filter>[1] Ripple\radmap</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\radmap\impl\BasicFullBelowCache.cpp">
<Filter>[1] Ripple\radmap\impl</Filter>
</ClCompile>
Expand Down Expand Up @@ -1395,9 +1305,6 @@
<ClCompile Include="..\..\src\ripple\peerfinder\sim\Tests.cpp">
<Filter>[1] Ripple\peerfinder\sim</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_rpc\ripple_rpc.cpp">
<Filter>[2] Old Ripple\ripple_rpc</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_rpc\impl\ErrorCodes.cpp">
<Filter>[2] Old Ripple\ripple_rpc\impl</Filter>
</ClCompile>
Expand All @@ -1416,9 +1323,6 @@
<ClCompile Include="..\..\src\ripple_overlay\impl\PeerDoor.cpp">
<Filter>[2] Old Ripple\ripple_overlay\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_overlay\ripple_overlay.cpp">
<Filter>[2] Old Ripple\ripple_overlay</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\peerfinder\impl\Bootcache.cpp">
<Filter>[1] Ripple\peerfinder\impl</Filter>
</ClCompile>
Expand All @@ -1434,9 +1338,6 @@
<ClCompile Include="..\..\src\ripple\peerfinder\impl\SlotImp.cpp">
<Filter>[1] Ripple\peerfinder\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\ripple_app_pt9.cpp">
<Filter>[2] Old Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\tx\Transaction.cpp">
<Filter>[2] Old Ripple\ripple_app\tx</Filter>
</ClCompile>
Expand Down Expand Up @@ -1722,6 +1623,105 @@
<ClCompile Include="..\..\src\ripple_rpc\impl\LookupLedger.cpp">
<Filter>[2] Old Ripple\ripple_rpc\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\beast\ripple_beast.unity.cpp">
<Filter>[1] Ripple\beast</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\beast\ripple_beastc.unity.c">
<Filter>[1] Ripple\beast</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\common\ripple_common.unity.cpp">
<Filter>[1] Ripple\common</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\http\ripple_http.unity.cpp">
<Filter>[1] Ripple\http</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\json\ripple_json.unity.cpp">
<Filter>[1] Ripple\json</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\peerfinder\ripple_peerfinder.unity.cpp">
<Filter>[1] Ripple\peerfinder</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\radmap\ripple_radmap.unity.cpp">
<Filter>[1] Ripple\radmap</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\resource\ripple_resource.unity.cpp">
<Filter>[1] Ripple\resource</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\rocksdb\ripple_rocksdb.unity.cpp">
<Filter>[1] Ripple\rocksdb</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\sitefiles\ripple_sitefiles.unity.cpp">
<Filter>[1] Ripple\sitefiles</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\sslutil\ripple_sslutil.unity.cpp">
<Filter>[1] Ripple\sslutil</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\testoverlay\ripple_testoverlay.unity.cpp">
<Filter>[1] Ripple\testoverlay</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\types\ripple_types.unity.cpp">
<Filter>[1] Ripple\types</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\validators\ripple_validators.unity.cpp">
<Filter>[1] Ripple\validators</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\ripple_app.unity.cpp">
<Filter>[2] Old Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\ripple_app_pt1.unity.cpp">
<Filter>[2] Old Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\ripple_app_pt2.unity.cpp">
<Filter>[2] Old Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\ripple_app_pt3.unity.cpp">
<Filter>[2] Old Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\ripple_app_pt4.unity.cpp">
<Filter>[2] Old Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\ripple_app_pt5.unity.cpp">
<Filter>[2] Old Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\ripple_app_pt6.unity.cpp">
<Filter>[2] Old Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\ripple_app_pt7.unity.cpp">
<Filter>[2] Old Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\ripple_app_pt8.unity.cpp">
<Filter>[2] Old Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\ripple_app_pt9.unity.cpp">
<Filter>[2] Old Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_basics\ripple_basics.unity.cpp">
<Filter>[2] Old Ripple\ripple_basics</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_core\ripple_core.unity.cpp">
<Filter>[2] Old Ripple\ripple_core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_data\ripple_data.unity.cpp">
<Filter>[2] Old Ripple\ripple_data</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_hyperleveldb\ripple_hyperleveldb.unity.cpp">
<Filter>[2] Old Ripple\ripple_hyperleveldb</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_leveldb\ripple_leveldb.unity.cpp">
<Filter>[2] Old Ripple\ripple_leveldb</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_net\ripple_net.unity.cpp">
<Filter>[2] Old Ripple\ripple_net</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_overlay\ripple_overlay.unity.cpp">
<Filter>[2] Old Ripple\ripple_overlay</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_rpc\ripple_rpc.unity.cpp">
<Filter>[2] Old Ripple\ripple_rpc</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_websocket\ripple_websocket.unity.cpp">
<Filter>[2] Old Ripple\ripple_websocket</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\ripple_basics\containers\RangeSet.h">
Expand Down Expand Up @@ -3367,9 +3367,6 @@
<None Include="..\..\SConstruct" />
<None Include="..\QtCreator\rippled.pro" />
<None Include="..\..\README.md" />
<None Include="..\..\src\ripple\beast\ripple_beastobjc.mm">
<Filter>[1] Ripple\beast</Filter>
</None>
<None Include="..\..\src\ripple\json\impl\json_internalarray.inl">
<Filter>[1] Ripple\json\impl</Filter>
</None>
Expand Down Expand Up @@ -3472,5 +3469,8 @@
<None Include="..\..\src\ripple_overlay\TODO.md">
<Filter>[2] Old Ripple\ripple_overlay</Filter>
</None>
<None Include="..\..\src\ripple\beast\ripple_beastobjc.unity.mm">
<Filter>[1] Ripple\beast</Filter>
</None>
</ItemGroup>
</Project>
Loading