From: Wladimir J. van der Laan Date: Sat, 11 Jun 2011 20:11:58 +0000 (+0200) Subject: move back to original directory structure X-Git-Tag: v0.4.0-unstable~226^2~57^2~255 X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=ba4081c1fcaddf361abd61b2721994eff5475bb3 move back to original directory structure --- diff --git a/bitcoin.pro b/bitcoin.pro index 7758376..dd9ea7f 100644 --- a/bitcoin.pro +++ b/bitcoin.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = DEPENDPATH += . -INCLUDEPATH += gui/include core/include cryptopp/include json/include +INCLUDEPATH += src src/json src/cryptopp src/qt unix:LIBS += -lssl -lboost_system -lboost_filesystem -lboost_program_options -lboost_thread -ldb_cxx macx:DEFINES += __WXMAC_OSX__ MSG_NOSIGNAL=0 @@ -11,97 +11,97 @@ QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wno-invalid-offsetof - # WINDOWS defines, -DSSL, look at build system # Input -DEPENDPATH += gui/include core/include cryptopp/include core/include json/include -HEADERS += gui/include/bitcoingui.h \ - gui/include/transactiontablemodel.h \ - gui/include/addresstablemodel.h \ - gui/include/optionsdialog.h \ - gui/include/sendcoinsdialog.h \ - gui/include/addressbookdialog.h \ - gui/include/aboutdialog.h \ - gui/include/editaddressdialog.h \ - gui/include/bitcoinaddressvalidator.h \ - core/include/base58.h \ - core/include/bignum.h \ - core/include/util.h \ - core/include/uint256.h \ - core/include/serialize.h \ - cryptopp/include/cryptopp/stdcpp.h \ - cryptopp/include/cryptopp/smartptr.h \ - cryptopp/include/cryptopp/simple.h \ - cryptopp/include/cryptopp/sha.h \ - cryptopp/include/cryptopp/secblock.h \ - cryptopp/include/cryptopp/pch.h \ - cryptopp/include/cryptopp/misc.h \ - cryptopp/include/cryptopp/iterhash.h \ - cryptopp/include/cryptopp/cryptlib.h \ - cryptopp/include/cryptopp/cpu.h \ - cryptopp/include/cryptopp/config.h \ - core/include/strlcpy.h \ - core/include/main.h \ - core/include/net.h \ - core/include/key.h \ - core/include/db.h \ - core/include/script.h \ - core/include/noui.h \ - core/include/init.h \ - core/include/headers.h \ - core/include/irc.h \ - json/include/json/json_spirit_writer_template.h \ - json/include/json/json_spirit_writer.h \ - json/include/json/json_spirit_value.h \ - json/include/json/json_spirit_utils.h \ - json/include/json/json_spirit_stream_reader.h \ - json/include/json/json_spirit_reader_template.h \ - json/include/json/json_spirit_reader.h \ - json/include/json/json_spirit_error_position.h \ - json/include/json/json_spirit.h \ - core/include/rpc.h \ - gui/include/clientmodel.h \ - gui/include/guiutil.h \ - gui/include/transactionrecord.h \ - gui/include/guiconstants.h \ - gui/include/optionsmodel.h \ - gui/include/monitoreddatamapper.h \ - core/include/externui.h \ - gui/include/transactiondesc.h \ - gui/include/transactiondescdialog.h -SOURCES += gui/src/bitcoin.cpp gui/src/bitcoingui.cpp \ - gui/src/transactiontablemodel.cpp \ - gui/src/addresstablemodel.cpp \ - gui/src/optionsdialog.cpp \ - gui/src/sendcoinsdialog.cpp \ - gui/src/addressbookdialog.cpp \ - gui/src/aboutdialog.cpp \ - gui/src/editaddressdialog.cpp \ - gui/src/bitcoinaddressvalidator.cpp \ - cryptopp/src/sha.cpp \ - cryptopp/src/cpu.cpp \ - core/src/util.cpp \ - core/src/script.cpp \ - core/src/main.cpp \ - core/src/init.cpp \ - core/src/rpc.cpp \ - core/src/net.cpp \ - core/src/irc.cpp \ - core/src/db.cpp \ - json/src/json_spirit_writer.cpp \ - json/src/json_spirit_value.cpp \ - json/src/json_spirit_reader.cpp \ - gui/src/clientmodel.cpp \ - gui/src/guiutil.cpp \ - gui/src/transactionrecord.cpp \ - gui/src/optionsmodel.cpp \ - gui/src/monitoreddatamapper.cpp \ - gui/src/transactiondesc.cpp \ - gui/src/transactiondescdialog.cpp +DEPENDPATH += src/qt src src/cryptopp src json/include +HEADERS += src/qt/bitcoingui.h \ + src/qt/transactiontablemodel.h \ + src/qt/addresstablemodel.h \ + src/qt/optionsdialog.h \ + src/qt/sendcoinsdialog.h \ + src/qt/addressbookdialog.h \ + src/qt/aboutdialog.h \ + src/qt/editaddressdialog.h \ + src/qt/bitcoinaddressvalidator.h \ + src/base58.h \ + src/bignum.h \ + src/util.h \ + src/uint256.h \ + src/serialize.h \ + src/cryptopp/stdcpp.h \ + src/cryptopp/smartptr.h \ + src/cryptopp/simple.h \ + src/cryptopp/sha.h \ + src/cryptopp/secblock.h \ + src/cryptopp/pch.h \ + src/cryptopp/misc.h \ + src/cryptopp/iterhash.h \ + src/cryptopp/cryptlib.h \ + src/cryptopp/cpu.h \ + src/cryptopp/config.h \ + src/strlcpy.h \ + src/main.h \ + src/net.h \ + src/key.h \ + src/db.h \ + src/script.h \ + src/noui.h \ + src/init.h \ + src/headers.h \ + src/irc.h \ + src/json/json_spirit_writer_template.h \ + src/json/json_spirit_writer.h \ + src/json/json_spirit_value.h \ + src/json/json_spirit_utils.h \ + src/json/json_spirit_stream_reader.h \ + src/json/json_spirit_reader_template.h \ + src/json/json_spirit_reader.h \ + src/json/json_spirit_error_position.h \ + src/json/json_spirit.h \ + src/rpc.h \ + src/qt/clientmodel.h \ + src/qt/guiutil.h \ + src/qt/transactionrecord.h \ + src/qt/guiconstants.h \ + src/qt/optionsmodel.h \ + src/qt/monitoreddatamapper.h \ + src/externui.h \ + src/qt/transactiondesc.h \ + src/qt/transactiondescdialog.h +SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ + src/qt/transactiontablemodel.cpp \ + src/qt/addresstablemodel.cpp \ + src/qt/optionsdialog.cpp \ + src/qt/sendcoinsdialog.cpp \ + src/qt/addressbookdialog.cpp \ + src/qt/aboutdialog.cpp \ + src/qt/editaddressdialog.cpp \ + src/qt/bitcoinaddressvalidator.cpp \ + src/cryptopp/sha.cpp \ + src/cryptopp/cpu.cpp \ + src/util.cpp \ + src/script.cpp \ + src/main.cpp \ + src/init.cpp \ + src/rpc.cpp \ + src/net.cpp \ + src/irc.cpp \ + src/db.cpp \ + src/json/json_spirit_writer.cpp \ + src/json/json_spirit_value.cpp \ + src/json/json_spirit_reader.cpp \ + src/qt/clientmodel.cpp \ + src/qt/guiutil.cpp \ + src/qt/transactionrecord.cpp \ + src/qt/optionsmodel.cpp \ + src/qt/monitoreddatamapper.cpp \ + src/qt/transactiondesc.cpp \ + src/qt/transactiondescdialog.cpp RESOURCES += \ - gui/bitcoin.qrc + src/qt/bitcoin.qrc FORMS += \ - gui/forms/sendcoinsdialog.ui \ - gui/forms/addressbookdialog.ui \ - gui/forms/aboutdialog.ui \ - gui/forms/editaddressdialog.ui \ - gui/forms/transactiondescdialog.ui + src/qt/forms/sendcoinsdialog.ui \ + src/qt/forms/addressbookdialog.ui \ + src/qt/forms/aboutdialog.ui \ + src/qt/forms/editaddressdialog.ui \ + src/qt/forms/transactiondescdialog.ui diff --git a/core/include/base58.h b/src/base58.h similarity index 100% rename from core/include/base58.h rename to src/base58.h diff --git a/core/include/bignum.h b/src/bignum.h similarity index 100% rename from core/include/bignum.h rename to src/bignum.h diff --git a/cryptopp/include/cryptopp/config.h b/src/cryptopp/config.h similarity index 100% rename from cryptopp/include/cryptopp/config.h rename to src/cryptopp/config.h diff --git a/cryptopp/src/cpu.cpp b/src/cryptopp/cpu.cpp similarity index 100% rename from cryptopp/src/cpu.cpp rename to src/cryptopp/cpu.cpp diff --git a/cryptopp/include/cryptopp/cpu.h b/src/cryptopp/cpu.h similarity index 100% rename from cryptopp/include/cryptopp/cpu.h rename to src/cryptopp/cpu.h diff --git a/cryptopp/include/cryptopp/cryptlib.h b/src/cryptopp/cryptlib.h similarity index 100% rename from cryptopp/include/cryptopp/cryptlib.h rename to src/cryptopp/cryptlib.h diff --git a/cryptopp/include/cryptopp/iterhash.h b/src/cryptopp/iterhash.h similarity index 100% rename from cryptopp/include/cryptopp/iterhash.h rename to src/cryptopp/iterhash.h diff --git a/cryptopp/include/cryptopp/misc.h b/src/cryptopp/misc.h similarity index 100% rename from cryptopp/include/cryptopp/misc.h rename to src/cryptopp/misc.h diff --git a/cryptopp/include/cryptopp/pch.h b/src/cryptopp/pch.h similarity index 100% rename from cryptopp/include/cryptopp/pch.h rename to src/cryptopp/pch.h diff --git a/cryptopp/include/cryptopp/secblock.h b/src/cryptopp/secblock.h similarity index 100% rename from cryptopp/include/cryptopp/secblock.h rename to src/cryptopp/secblock.h diff --git a/cryptopp/src/sha.cpp b/src/cryptopp/sha.cpp similarity index 100% rename from cryptopp/src/sha.cpp rename to src/cryptopp/sha.cpp diff --git a/cryptopp/include/cryptopp/sha.h b/src/cryptopp/sha.h similarity index 100% rename from cryptopp/include/cryptopp/sha.h rename to src/cryptopp/sha.h diff --git a/cryptopp/include/cryptopp/simple.h b/src/cryptopp/simple.h similarity index 100% rename from cryptopp/include/cryptopp/simple.h rename to src/cryptopp/simple.h diff --git a/cryptopp/include/cryptopp/smartptr.h b/src/cryptopp/smartptr.h similarity index 100% rename from cryptopp/include/cryptopp/smartptr.h rename to src/cryptopp/smartptr.h diff --git a/cryptopp/include/cryptopp/stdcpp.h b/src/cryptopp/stdcpp.h similarity index 100% rename from cryptopp/include/cryptopp/stdcpp.h rename to src/cryptopp/stdcpp.h diff --git a/core/src/db.cpp b/src/db.cpp similarity index 100% rename from core/src/db.cpp rename to src/db.cpp diff --git a/core/include/db.h b/src/db.h similarity index 100% rename from core/include/db.h rename to src/db.h diff --git a/core/include/externui.h b/src/externui.h similarity index 100% rename from core/include/externui.h rename to src/externui.h diff --git a/core/include/headers.h b/src/headers.h similarity index 100% rename from core/include/headers.h rename to src/headers.h diff --git a/core/src/init.cpp b/src/init.cpp similarity index 100% rename from core/src/init.cpp rename to src/init.cpp diff --git a/core/include/init.h b/src/init.h similarity index 100% rename from core/include/init.h rename to src/init.h diff --git a/core/src/irc.cpp b/src/irc.cpp similarity index 100% rename from core/src/irc.cpp rename to src/irc.cpp diff --git a/core/include/irc.h b/src/irc.h similarity index 100% rename from core/include/irc.h rename to src/irc.h diff --git a/json/include/json/json_spirit.h b/src/json/json_spirit.h similarity index 100% rename from json/include/json/json_spirit.h rename to src/json/json_spirit.h diff --git a/json/include/json/json_spirit_error_position.h b/src/json/json_spirit_error_position.h similarity index 100% rename from json/include/json/json_spirit_error_position.h rename to src/json/json_spirit_error_position.h diff --git a/json/src/json_spirit_reader.cpp b/src/json/json_spirit_reader.cpp similarity index 100% rename from json/src/json_spirit_reader.cpp rename to src/json/json_spirit_reader.cpp diff --git a/json/include/json/json_spirit_reader.h b/src/json/json_spirit_reader.h similarity index 100% rename from json/include/json/json_spirit_reader.h rename to src/json/json_spirit_reader.h diff --git a/json/include/json/json_spirit_reader_template.h b/src/json/json_spirit_reader_template.h similarity index 100% rename from json/include/json/json_spirit_reader_template.h rename to src/json/json_spirit_reader_template.h diff --git a/json/include/json/json_spirit_stream_reader.h b/src/json/json_spirit_stream_reader.h similarity index 100% rename from json/include/json/json_spirit_stream_reader.h rename to src/json/json_spirit_stream_reader.h diff --git a/json/include/json/json_spirit_utils.h b/src/json/json_spirit_utils.h similarity index 100% rename from json/include/json/json_spirit_utils.h rename to src/json/json_spirit_utils.h diff --git a/json/src/json_spirit_value.cpp b/src/json/json_spirit_value.cpp similarity index 100% rename from json/src/json_spirit_value.cpp rename to src/json/json_spirit_value.cpp diff --git a/json/include/json/json_spirit_value.h b/src/json/json_spirit_value.h similarity index 100% rename from json/include/json/json_spirit_value.h rename to src/json/json_spirit_value.h diff --git a/json/src/json_spirit_writer.cpp b/src/json/json_spirit_writer.cpp similarity index 100% rename from json/src/json_spirit_writer.cpp rename to src/json/json_spirit_writer.cpp diff --git a/json/include/json/json_spirit_writer.h b/src/json/json_spirit_writer.h similarity index 100% rename from json/include/json/json_spirit_writer.h rename to src/json/json_spirit_writer.h diff --git a/json/include/json/json_spirit_writer_template.h b/src/json/json_spirit_writer_template.h similarity index 100% rename from json/include/json/json_spirit_writer_template.h rename to src/json/json_spirit_writer_template.h diff --git a/core/include/key.h b/src/key.h similarity index 100% rename from core/include/key.h rename to src/key.h diff --git a/core/src/main.cpp b/src/main.cpp similarity index 100% rename from core/src/main.cpp rename to src/main.cpp diff --git a/core/include/main.h b/src/main.h similarity index 100% rename from core/include/main.h rename to src/main.h diff --git a/core/src/net.cpp b/src/net.cpp similarity index 100% rename from core/src/net.cpp rename to src/net.cpp diff --git a/core/include/net.h b/src/net.h similarity index 100% rename from core/include/net.h rename to src/net.h diff --git a/core/include/noui.h b/src/noui.h similarity index 100% rename from core/include/noui.h rename to src/noui.h diff --git a/gui/src/aboutdialog.cpp b/src/qt/aboutdialog.cpp similarity index 100% rename from gui/src/aboutdialog.cpp rename to src/qt/aboutdialog.cpp diff --git a/gui/include/aboutdialog.h b/src/qt/aboutdialog.h similarity index 100% rename from gui/include/aboutdialog.h rename to src/qt/aboutdialog.h diff --git a/gui/src/addressbookdialog.cpp b/src/qt/addressbookdialog.cpp similarity index 100% rename from gui/src/addressbookdialog.cpp rename to src/qt/addressbookdialog.cpp diff --git a/gui/include/addressbookdialog.h b/src/qt/addressbookdialog.h similarity index 100% rename from gui/include/addressbookdialog.h rename to src/qt/addressbookdialog.h diff --git a/gui/src/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp similarity index 100% rename from gui/src/addresstablemodel.cpp rename to src/qt/addresstablemodel.cpp diff --git a/gui/include/addresstablemodel.h b/src/qt/addresstablemodel.h similarity index 100% rename from gui/include/addresstablemodel.h rename to src/qt/addresstablemodel.h diff --git a/gui/src/bitcoin.cpp b/src/qt/bitcoin.cpp similarity index 100% rename from gui/src/bitcoin.cpp rename to src/qt/bitcoin.cpp diff --git a/gui/bitcoin.qrc b/src/qt/bitcoin.qrc similarity index 100% rename from gui/bitcoin.qrc rename to src/qt/bitcoin.qrc diff --git a/gui/src/bitcoinaddressvalidator.cpp b/src/qt/bitcoinaddressvalidator.cpp similarity index 100% rename from gui/src/bitcoinaddressvalidator.cpp rename to src/qt/bitcoinaddressvalidator.cpp diff --git a/gui/include/bitcoinaddressvalidator.h b/src/qt/bitcoinaddressvalidator.h similarity index 100% rename from gui/include/bitcoinaddressvalidator.h rename to src/qt/bitcoinaddressvalidator.h diff --git a/gui/src/bitcoingui.cpp b/src/qt/bitcoingui.cpp similarity index 100% rename from gui/src/bitcoingui.cpp rename to src/qt/bitcoingui.cpp diff --git a/gui/include/bitcoingui.h b/src/qt/bitcoingui.h similarity index 100% rename from gui/include/bitcoingui.h rename to src/qt/bitcoingui.h diff --git a/gui/src/clientmodel.cpp b/src/qt/clientmodel.cpp similarity index 100% rename from gui/src/clientmodel.cpp rename to src/qt/clientmodel.cpp diff --git a/gui/include/clientmodel.h b/src/qt/clientmodel.h similarity index 100% rename from gui/include/clientmodel.h rename to src/qt/clientmodel.h diff --git a/gui/src/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp similarity index 100% rename from gui/src/editaddressdialog.cpp rename to src/qt/editaddressdialog.cpp diff --git a/gui/include/editaddressdialog.h b/src/qt/editaddressdialog.h similarity index 100% rename from gui/include/editaddressdialog.h rename to src/qt/editaddressdialog.h diff --git a/gui/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui similarity index 100% rename from gui/forms/aboutdialog.ui rename to src/qt/forms/aboutdialog.ui diff --git a/gui/forms/addressbookdialog.ui b/src/qt/forms/addressbookdialog.ui similarity index 100% rename from gui/forms/addressbookdialog.ui rename to src/qt/forms/addressbookdialog.ui diff --git a/gui/forms/editaddressdialog.ui b/src/qt/forms/editaddressdialog.ui similarity index 100% rename from gui/forms/editaddressdialog.ui rename to src/qt/forms/editaddressdialog.ui diff --git a/gui/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui similarity index 100% rename from gui/forms/sendcoinsdialog.ui rename to src/qt/forms/sendcoinsdialog.ui diff --git a/gui/forms/transactiondescdialog.ui b/src/qt/forms/transactiondescdialog.ui similarity index 100% rename from gui/forms/transactiondescdialog.ui rename to src/qt/forms/transactiondescdialog.ui diff --git a/gui/include/guiconstants.h b/src/qt/guiconstants.h similarity index 100% rename from gui/include/guiconstants.h rename to src/qt/guiconstants.h diff --git a/gui/src/guiutil.cpp b/src/qt/guiutil.cpp similarity index 100% rename from gui/src/guiutil.cpp rename to src/qt/guiutil.cpp diff --git a/gui/include/guiutil.h b/src/qt/guiutil.h similarity index 100% rename from gui/include/guiutil.h rename to src/qt/guiutil.h diff --git a/gui/src/monitoreddatamapper.cpp b/src/qt/monitoreddatamapper.cpp similarity index 100% rename from gui/src/monitoreddatamapper.cpp rename to src/qt/monitoreddatamapper.cpp diff --git a/gui/include/monitoreddatamapper.h b/src/qt/monitoreddatamapper.h similarity index 100% rename from gui/include/monitoreddatamapper.h rename to src/qt/monitoreddatamapper.h diff --git a/gui/src/optionsdialog.cpp b/src/qt/optionsdialog.cpp similarity index 100% rename from gui/src/optionsdialog.cpp rename to src/qt/optionsdialog.cpp diff --git a/gui/include/optionsdialog.h b/src/qt/optionsdialog.h similarity index 100% rename from gui/include/optionsdialog.h rename to src/qt/optionsdialog.h diff --git a/gui/src/optionsmodel.cpp b/src/qt/optionsmodel.cpp similarity index 100% rename from gui/src/optionsmodel.cpp rename to src/qt/optionsmodel.cpp diff --git a/gui/include/optionsmodel.h b/src/qt/optionsmodel.h similarity index 100% rename from gui/include/optionsmodel.h rename to src/qt/optionsmodel.h diff --git a/gui/src/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp similarity index 100% rename from gui/src/sendcoinsdialog.cpp rename to src/qt/sendcoinsdialog.cpp diff --git a/gui/include/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h similarity index 100% rename from gui/include/sendcoinsdialog.h rename to src/qt/sendcoinsdialog.h diff --git a/gui/src/transactiondesc.cpp b/src/qt/transactiondesc.cpp similarity index 100% rename from gui/src/transactiondesc.cpp rename to src/qt/transactiondesc.cpp diff --git a/gui/include/transactiondesc.h b/src/qt/transactiondesc.h similarity index 100% rename from gui/include/transactiondesc.h rename to src/qt/transactiondesc.h diff --git a/gui/src/transactiondescdialog.cpp b/src/qt/transactiondescdialog.cpp similarity index 100% rename from gui/src/transactiondescdialog.cpp rename to src/qt/transactiondescdialog.cpp diff --git a/gui/include/transactiondescdialog.h b/src/qt/transactiondescdialog.h similarity index 100% rename from gui/include/transactiondescdialog.h rename to src/qt/transactiondescdialog.h diff --git a/gui/src/transactionrecord.cpp b/src/qt/transactionrecord.cpp similarity index 100% rename from gui/src/transactionrecord.cpp rename to src/qt/transactionrecord.cpp diff --git a/gui/include/transactionrecord.h b/src/qt/transactionrecord.h similarity index 100% rename from gui/include/transactionrecord.h rename to src/qt/transactionrecord.h diff --git a/gui/src/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp similarity index 100% rename from gui/src/transactiontablemodel.cpp rename to src/qt/transactiontablemodel.cpp diff --git a/gui/include/transactiontablemodel.h b/src/qt/transactiontablemodel.h similarity index 100% rename from gui/include/transactiontablemodel.h rename to src/qt/transactiontablemodel.h diff --git a/core/src/rpc.cpp b/src/rpc.cpp similarity index 100% rename from core/src/rpc.cpp rename to src/rpc.cpp diff --git a/core/include/rpc.h b/src/rpc.h similarity index 100% rename from core/include/rpc.h rename to src/rpc.h diff --git a/core/src/script.cpp b/src/script.cpp similarity index 100% rename from core/src/script.cpp rename to src/script.cpp diff --git a/core/include/script.h b/src/script.h similarity index 100% rename from core/include/script.h rename to src/script.h diff --git a/core/include/serialize.h b/src/serialize.h similarity index 100% rename from core/include/serialize.h rename to src/serialize.h diff --git a/core/include/strlcpy.h b/src/strlcpy.h similarity index 100% rename from core/include/strlcpy.h rename to src/strlcpy.h diff --git a/core/include/uint256.h b/src/uint256.h similarity index 100% rename from core/include/uint256.h rename to src/uint256.h diff --git a/core/src/util.cpp b/src/util.cpp similarity index 100% rename from core/src/util.cpp rename to src/util.cpp diff --git a/core/include/util.h b/src/util.h similarity index 100% rename from core/include/util.h rename to src/util.h