Skip to content

Commit

Permalink
Test-Patch Full Rename Bitmark to Gamecredits
Browse files Browse the repository at this point in the history
Untested !!!
  • Loading branch information
gamers-coin committed Jul 28, 2015
1 parent 20251e4 commit 683cab8
Show file tree
Hide file tree
Showing 253 changed files with 895 additions and 895 deletions.
2 changes: 1 addition & 1 deletion COPYING
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2009-2013 Bitmark Developers
Copyright (c) 2009-2013 Gamecredits Developers

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
26 changes: 13 additions & 13 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ OSX_APP=GameCredits-Qt.app
OSX_DMG=GameCredits-Qt.dmg
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitmark.icns
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/gamecredits.icns
OSX_PLIST=$(top_srcdir)/share/qt/Info.plist #not installed
OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW

DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)

WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitmark.ico \
WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/gamecredits.ico \
$(top_srcdir)/share/pixmaps/nsis-header.bmp \
$(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
$(top_srcdir)/doc/README_windows.txt
Expand All @@ -31,7 +31,7 @@ OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \
leveldb_baseline.info test_gamecredits_filtered.info total_coverage.info \
baseline_filtered.info block_test_filtered.info \
leveldb_baseline_filtered.info test_gamecredits_coverage.info test_bitmark.info
leveldb_baseline_filtered.info test_gamecredits_coverage.info test_gamecredits.info

dist-hook:
-$(MAKE) -C $(top_distdir)/src/leveldb clean
Expand Down Expand Up @@ -68,7 +68,7 @@ $(OSX_APP)/Contents/Info.plist: $(OSX_PLIST)
$(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@

$(OSX_APP)/Contents/Resources/bitmark.icns: $(OSX_INSTALLER_ICONS)
$(OSX_APP)/Contents/Resources/gamecredits.icns: $(OSX_INSTALLER_ICONS)
$(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@

Expand All @@ -77,7 +77,7 @@ $(OSX_APP)/Contents/MacOS/GameCredits-Qt: $(BITMARK_QT_BIN)
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@

OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
$(OSX_APP)/Contents/Resources/bitmark.icns $(OSX_APP)/Contents/Info.plist \
$(OSX_APP)/Contents/Resources/gamecredits.icns $(OSX_APP)/Contents/Info.plist \
$(OSX_APP)/Contents/MacOS/GameCredits-Qt

if BUILD_DARWIN
Expand Down Expand Up @@ -119,18 +119,18 @@ leveldb_baseline_filtered.info: leveldb_baseline.info
baseline_filtered_combined.info: leveldb_baseline_filtered.info baseline_filtered.info
$(LCOV) -a leveldb_baseline_filtered.info -a baseline_filtered.info -o $@

test_bitmark.info: baseline_filtered_combined.info
test_gamecredits.info: baseline_filtered_combined.info
$(MAKE) -C src/ check
$(LCOV) -c -d $(abs_builddir)/src -t test_bitmark -o $@
$(LCOV) -c -d $(abs_builddir)/src -t test_gamecredits -o $@
$(LCOV) -z -d $(abs_builddir)/src
$(LCOV) -z -d $(abs_builddir)/src/leveldb

test_gamecredits_filtered.info: test_bitmark.info
test_gamecredits_filtered.info: test_gamecredits.info
$(LCOV) -r $< "/usr/include/*" -o $@

block_test.info: test_gamecredits_filtered.info
$(MKDIR_P) qa/tmp
-@TIMEOUT=15 qa/pull-tester/run-bitmarkd-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool 0
-@TIMEOUT=15 qa/pull-tester/run-gamecreditsd-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool 0
$(LCOV) -c -d $(abs_builddir)/src --t BitmarkJBlockTest -o $@
$(LCOV) -z -d $(abs_builddir)/src
$(LCOV) -z -d $(abs_builddir)/src/leveldb
Expand All @@ -144,22 +144,22 @@ test_gamecredits_coverage.info: baseline_filtered_combined.info test_gamecredits
total_coverage.info: baseline_filtered_combined.info test_gamecredits_filtered.info block_test_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_gamecredits_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt

test_bitmark.coverage/.dirstamp: test_gamecredits_coverage.info
test_gamecredits.coverage/.dirstamp: test_gamecredits_coverage.info
$(GENHTML) -s $< -o $(@D)
@touch $@

total.coverage/.dirstamp: total_coverage.info
$(GENHTML) -s $< -o $(@D)
@touch $@

cov: test_bitmark.coverage/.dirstamp total.coverage/.dirstamp
cov: test_gamecredits.coverage/.dirstamp total.coverage/.dirstamp

endif

if USE_COMPARISON_TOOL
check-local:
$(MKDIR_P) qa/tmp
@qa/pull-tester/run-bitmarkd-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS)
@qa/pull-tester/run-gamecreditsd-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS)
endif

EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/pull-tester.sh qa/rpc-tests $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING)
Expand All @@ -169,4 +169,4 @@ CLEANFILES = $(OSX_DMG) $(BITMARK_WIN_INSTALLER)
.INTERMEDIATE: $(COVERAGE_INFO)

clean-local:
rm -rf test_bitmark.coverage/ total.coverage/ $(OSX_APP)
rm -rf test_gamecredits.coverage/ total.coverage/ $(OSX_APP)
28 changes: 14 additions & 14 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ define(_CLIENT_VERSION_REVISION, 4)
define(_CLIENT_VERSION_BUILD, 3)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2015)
AC_INIT([GameCredits Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@bitmark.org],[gamecredits])
AC_INIT([GameCredits Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@gamecredits.org],[gamecredits])
AC_CONFIG_AUX_DIR([src/build-aux])
AC_CONFIG_MACRO_DIR([src/m4])
AC_CANONICAL_HOST
Expand Down Expand Up @@ -111,7 +111,7 @@ AC_ARG_WITH([protoc-bindir],[AS_HELP_STRING([--with-protoc-bindir=BIN_DIR],[spec


AC_CONFIG_SRCDIR([src])
AC_CONFIG_HEADERS([src/bitmark-config.h])
AC_CONFIG_HEADERS([src/gamecredits-config.h])

dnl Checks for programs.
AC_PROG_CXX
Expand Down Expand Up @@ -299,7 +299,7 @@ dnl Check for pthread compile/link requirements
AX_PTHREAD
INCLUDES="$INCLUDES $PTHREAD_CFLAGS"

# The following macro will add the necessary defines to bitmark-config.h, but
# The following macro will add the necessary defines to gamecredits-config.h, but
# they also need to be passed down to any subprojects. Pull the results out of
# the cache and add them to CPPFLAGS.
AC_SYS_LARGEFILE
Expand Down Expand Up @@ -502,8 +502,8 @@ fi
AC_ARG_WITH([cli],
[AS_HELP_STRING([--with-cli],
[with CLI (default is yes)])],
[build_bitmark_cli=$withval],
[build_bitmark_cli=yes])
[build_gamecredits_cli=$withval],
[build_gamecredits_cli=yes])

AC_ARG_WITH([daemon],
[AS_HELP_STRING([--with-daemon],
Expand Down Expand Up @@ -552,10 +552,10 @@ AM_CONDITIONAL([BUILD_BITMARKD], [test x$build_gamecreditsd = xyes])
AC_MSG_RESULT($build_gamecreditsd)

AC_MSG_CHECKING([whether to build gamecredits-cli])
AM_CONDITIONAL([BUILD_BITMARK_CLI], [test x$build_bitmark_cli = xyes])
AC_MSG_RESULT($build_bitmark_cli)
AM_CONDITIONAL([BUILD_BITMARK_CLI], [test x$build_gamecredits_cli = xyes])
AC_MSG_RESULT($build_gamecredits_cli)

dnl sets $bitmark_enable_qt, $bitmark_enable_qt_test, $bitmark_enable_qt_dbus
dnl sets $gamecredits_enable_qt, $gamecredits_enable_qt_test, $gamecredits_enable_qt_dbus
BITMARK_QT_CONFIGURE([$use_pkgconfig], [qt4])

AC_LANG_POP
Expand Down Expand Up @@ -614,14 +614,14 @@ else
fi

dnl these are only used when qt is enabled
if test x$bitmark_enable_qt != xno; then
if test x$gamecredits_enable_qt != xno; then
BUILD_QT=qt
dnl enable dbus support
AC_MSG_CHECKING([whether to build GUI with support for D-Bus])
if test x$bitmark_enable_qt_dbus != xno; then
if test x$gamecredits_enable_qt_dbus != xno; then
AC_DEFINE([USE_DBUS],[1],[Define if dbus support should be compiled in])
fi
AC_MSG_RESULT($bitmark_enable_qt_dbus)
AC_MSG_RESULT($gamecredits_enable_qt_dbus)

dnl enable qr support
AC_MSG_CHECKING([whether to build GUI with support for QR codes])
Expand All @@ -645,15 +645,15 @@ if test x$bitmark_enable_qt != xno; then
fi

AC_MSG_CHECKING([whether to build test_gamecredits-qt])
if test x$use_tests$bitmark_enable_qt_test = xyesyes; then
if test x$use_tests$gamecredits_enable_qt_test = xyesyes; then
AC_MSG_RESULT([yes])
BUILD_TEST_QT="test"
else
AC_MSG_RESULT([no])
fi
fi

AC_MSG_CHECKING([whether to build test_bitmark])
AC_MSG_CHECKING([whether to build test_gamecredits])
if test x$use_tests = xyes; then
AC_MSG_RESULT([yes])
BUILD_TEST="test"
Expand Down Expand Up @@ -699,6 +699,6 @@ AC_SUBST(BUILD_TEST)
AC_SUBST(BUILD_QT)
AC_SUBST(BUILD_TEST_QT)
AC_CONFIG_FILES([Makefile src/Makefile src/test/Makefile src/qt/Makefile src/qt/test/Makefile share/setup.nsi share/qt/Info.plist])
AC_CONFIG_FILES([qa/pull-tester/run-bitmarkd-for-test.sh],[chmod +x qa/pull-tester/run-bitmarkd-for-test.sh])
AC_CONFIG_FILES([qa/pull-tester/run-gamecreditsd-for-test.sh],[chmod +x qa/pull-tester/run-gamecreditsd-for-test.sh])
AC_CONFIG_FILES([qa/pull-tester/build-tests.sh],[chmod +x qa/pull-tester/build-tests.sh])
AC_OUTPUT
8 changes: 4 additions & 4 deletions contrib/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Wallet Tools
---------------------

### [BitRPC](/contrib/bitrpc) ###
Allows for sending of all standard Bitmark commands via RPC rather than as command line args.
Allows for sending of all standard Gamecredits commands via RPC rather than as command line args.

### [SpendFrom](/contrib/spendfrom) ###

Expand All @@ -21,11 +21,11 @@ Construct a linear, no-fork, best version of the blockchain.

### [PyMiner](/contrib/pyminer) ###

This is a 'getwork' CPU mining client for Bitmark. It is pure-python, and therefore very, very slow. The purpose is to provide a reference implementation of a miner, for study.
This is a 'getwork' CPU mining client for Gamecredits. It is pure-python, and therefore very, very slow. The purpose is to provide a reference implementation of a miner, for study.

### [Qos](/contrib/qos) ###

A Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitmark network. This means one can have an always-on gamecreditsd instance running, and another local gamecreditsd/gamecredits-qt instance which connects to this node and receives blocks from it.
A Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Gamecredits network. This means one can have an always-on gamecreditsd instance running, and another local gamecreditsd/gamecredits-qt instance which connects to this node and receives blocks from it.

### [Seeds](/contrib/seeds) ###
Utility to generate the pnSeed[] array that is compiled into the client.
Expand All @@ -50,7 +50,7 @@ Test and Verify Tools
---------------------

### [TestGen](/contrib/testgen) ###
Utilities to generate test vectors for the data-driven Bitmark tests.
Utilities to generate test vectors for the data-driven Gamecredits tests.

### [Test Patches](/contrib/test-patches) ###
These patches are applied when the automated pull-tester
Expand Down
2 changes: 1 addition & 1 deletion contrib/bitrpc/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### BitRPC
Allows for sending of all standard Bitmark commands via RPC rather than as command line args.
Allows for sending of all standard Gamecredits commands via RPC rather than as command line args.

### Looking for Wallet Tools?
BitRPC.py is able to do the exact same thing as `walletchangepass.py` and `walletunlock.py`. Their respective commands in BitRPC.py are:
Expand Down
4 changes: 2 additions & 2 deletions contrib/bitrpc/bitrpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

elif cmd == "getaccount":
try:
addr = raw_input("Enter a Bitmark address: ")
addr = raw_input("Enter a Gamecredits address: ")
print access.getaccount(addr)
except:
print "\n---An error occurred---\n"
Expand Down Expand Up @@ -127,7 +127,7 @@

elif cmd == "getreceivedbyaddress":
try:
addr = raw_input("Enter a Bitmark address (optional): ")
addr = raw_input("Enter a Gamecredits address (optional): ")
mc = raw_input("Minimum confirmations (optional): ")
try:
print access.getreceivedbyaddress(addr, mc)
Expand Down
16 changes: 8 additions & 8 deletions contrib/devtools/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ A small script to automate merging pull-requests securely and sign them with GPG

For example:

./github-merge.sh bitmark/bitmark 3077
./github-merge.sh gamecredits/gamecredits 3077

(in any git repository) will help you merge pull request #3077 for the
bitmark/bitmark repository.
gamecredits/gamecredits repository.

What it does:
* Fetch master and the pull request.
Expand All @@ -30,9 +30,9 @@ couldn't mess with the sources.

Setup
---------
Configuring the github-merge tool for the bitmark repository is done in the following way:
Configuring the github-merge tool for the gamecredits repository is done in the following way:

git config githubmerge.repository bitmark/bitmark
git config githubmerge.repository gamecredits/gamecredits
git config githubmerge.testcmd "make -j4 check" (adapt to whatever you want to use for testing)
git config --global user.signingkey mykeyid (if you want to GPG sign)

Expand Down Expand Up @@ -64,10 +64,10 @@ If only supported symbols are used the return value will be 0 and the output wil

If there are 'unsupported' symbols, the return value will be 1 a list like this will be printed:

.../64/test_bitmark: symbol memcpy from unsupported version GLIBC_2.14
.../64/test_bitmark: symbol __fdelt_chk from unsupported version GLIBC_2.15
.../64/test_bitmark: symbol std::out_of_range::~out_of_range() from unsupported version GLIBCXX_3.4.15
.../64/test_bitmark: symbol _ZNSt8__detail15_List_nod from unsupported version GLIBCXX_3.4.15
.../64/test_gamecredits: symbol memcpy from unsupported version GLIBC_2.14
.../64/test_gamecredits: symbol __fdelt_chk from unsupported version GLIBC_2.15
.../64/test_gamecredits: symbol std::out_of_range::~out_of_range() from unsupported version GLIBCXX_3.4.15
.../64/test_gamecredits: symbol _ZNSt8__detail15_List_nod from unsupported version GLIBCXX_3.4.15

update-translations.py
=======================
Expand Down
2 changes: 1 addition & 1 deletion contrib/devtools/fix-copyright-headers.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

year = time.gmtime()[0]
last_year = year - 1
command = "perl -pi -e 's/%s The Bitmark/%s The Bitmark/' %s"
command = "perl -pi -e 's/%s The Gamecredits/%s The Gamecredits/' %s"
listFilesCommand = "find . | grep %s"

extensions = [".cpp",".h"]
Expand Down
2 changes: 1 addition & 1 deletion contrib/devtools/update-translations.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
# Name of transifex tool
TX = 'tx'
# Name of source language file
SOURCE_LANG = 'bitmark_en.ts'
SOURCE_LANG = 'gamecredits_en.ts'
# Directory with locale files
LOCALE_DIR = 'src/qt/locale'

Expand Down
2 changes: 1 addition & 1 deletion contrib/bitmark-qt.pro → contrib/gamecredits-qt.pro
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ FORMS += \
../src/qt/forms/transactiondescdialog.ui \

RESOURCES += \
../src/qt/bitmark.qrc
../src/qt/gamecredits.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
have gamecreditsd && {

# call $gamecreditsd for RPC
_bitmark_rpc() {
_gamecredits_rpc() {
# determine already specified args necessary for RPC
local rpcargs=()
for i in ${COMP_LINE}; do
Expand All @@ -19,10 +19,10 @@ _bitmark_rpc() {
$gamecreditsd "${rpcargs[@]}" "$@"
}

# Add bitmark accounts to COMPREPLY
_bitmark_accounts() {
# Add gamecredits accounts to COMPREPLY
_gamecredits_accounts() {
local accounts
accounts=$(_bitmark_rpc listaccounts | awk '/".*"/ { a=$1; gsub(/"/, "", a); print a}')
accounts=$(_gamecredits_rpc listaccounts | awk '/".*"/ { a=$1; gsub(/"/, "", a); print a}')
COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "$accounts" -- "$cur" ) )
}

Expand All @@ -49,7 +49,7 @@ _gamecreditsd() {
if ((cword > 3)); then
case ${words[cword-3]} in
addmultisigaddress)
_bitmark_accounts
_gamecredits_accounts
return 0
;;
gettxout|importprivkey)
Expand All @@ -70,7 +70,7 @@ _gamecreditsd() {
return 0
;;
move|setaccount)
_bitmark_accounts
_gamecredits_accounts
return 0
;;
esac
Expand All @@ -86,7 +86,7 @@ _gamecreditsd() {
return 0
;;
getaccountaddress|getaddressesbyaccount|getbalance|getnewaddress|getreceivedbyaccount|listtransactions|move|sendfrom|sendmany)
_bitmark_accounts
_gamecredits_accounts
return 0
;;
esac
Expand Down Expand Up @@ -115,7 +115,7 @@ _gamecreditsd() {

# only parse help if senseful
if [[ -z "$cur" || "$cur" =~ ^[a-z] ]]; then
commands=$(_bitmark_rpc help 2>/dev/null | awk '{ print $1; }')
commands=$(_gamecredits_rpc help 2>/dev/null | awk '{ print $1; }')
fi

COMPREPLY=( $( compgen -W "$helpopts $commands" -- "$cur" ) )
Expand Down
Binary file modified contrib/macdeploy/DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion contrib/pyminer/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### PyMiner ###

This is a 'getwork' CPU mining client for Bitmark. It is pure-python, and therefore very, very slow. The purpose is to provide a reference implementation of a miner, for study.
This is a 'getwork' CPU mining client for Gamecredits. It is pure-python, and therefore very, very slow. The purpose is to provide a reference implementation of a miner, for study.

### Other Resources ###

Expand Down
2 changes: 1 addition & 1 deletion contrib/qos/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### Qos ###

This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitmark network. It limits outbound TCP traffic with a source or destination port of 40002, but not if the destination IP is within a LAN (defined as 192.168.x.x).
This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Gamecredits network. It limits outbound TCP traffic with a source or destination port of 40002, but not if the destination IP is within a LAN (defined as 192.168.x.x).

This means one can have an always-on gamecreditsd instance running, and another local gamecreditsd/gamecredits-qt instance which connects to this node and receives blocks from it.
Loading

0 comments on commit 683cab8

Please sign in to comment.