Skip to content

Commit c628147

Browse files
dexX7dexX7
committed
Rebrand to Omni Core (file level)
1 parent 89f19c6 commit c628147

21 files changed

+128
-121
lines changed

‎.gitignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ src/bitcoin-cli
77
src/bitcoin-tx
88
src/test/test_bitcoin
99
src/qt/test/test_bitcoin-qt
10+
src/omnicored
11+
src/omnicore-cli
12+
src/test/test_omnicore
13+
src/qt/test/test_omnicore-qt
1014

1115
# autoreconf
1216
Makefile.in
@@ -76,10 +80,13 @@ src/qt/test/moc*.cpp
7680
Makefile
7781
bitcoin-qt
7882
Bitcoin-Qt.app
83+
omnicore-qt
84+
OmniCore-Qt.app
7985

8086
# Unit-tests
8187
Makefile.test
8288
bitcoin-qt_test
89+
omnicore-qt_test
8390
src/test/buildenv.py
8491

8592
# Resources cpp

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ before_script:
9191
- depends/$HOST/native/bin/ccache --max-size=$CCACHE_SIZE
9292
- test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh
9393
- ./configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
94-
- make distdir PACKAGE=bitcoin VERSION=$HOST
95-
- cd bitcoin-$HOST
94+
- make distdir PACKAGE=omnicore VERSION=$HOST
95+
- cd omnicore-$HOST
9696
- ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
9797
script:
9898
- make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )

‎Makefile.am‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ SUBDIRS = src
44

55
GZIP_ENV="-9n"
66

7-
BITCOIND_BIN=$(top_builddir)/src/bitcoind$(EXEEXT)
8-
BITCOIN_QT_BIN=$(top_builddir)/src/qt/bitcoin-qt$(EXEEXT)
9-
BITCOIN_CLI_BIN=$(top_builddir)/src/bitcoin-cli$(EXEEXT)
7+
BITCOIND_BIN=$(top_builddir)/src/omnicored$(EXEEXT)
8+
BITCOIN_QT_BIN=$(top_builddir)/src/qt/omnicore-qt$(EXEEXT)
9+
BITCOIN_CLI_BIN=$(top_builddir)/src/omnicore-cli$(EXEEXT)
1010
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
1111

12-
OSX_APP=Bitcoin-Qt.app
13-
OSX_DMG=Bitcoin-Qt.dmg
12+
OSX_APP=OmniCore-Qt.app
13+
OSX_DMG=OmniCore-Qt.dmg
1414
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
1515
OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
1616
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
@@ -76,13 +76,13 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
7676
$(MKDIR_P) $(@D)
7777
$(INSTALL_DATA) $< $@
7878

79-
$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(BITCOIN_QT_BIN)
79+
$(OSX_APP)/Contents/MacOS/OmniCore-Qt: $(BITCOIN_QT_BIN)
8080
$(MKDIR_P) $(@D)
8181
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@
8282

8383
OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
8484
$(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \
85-
$(OSX_APP)/Contents/MacOS/Bitcoin-Qt
85+
$(OSX_APP)/Contents/MacOS/OmniCore-Qt
8686

8787
if BUILD_DARWIN
8888
$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
@@ -97,18 +97,18 @@ $(APP_DIST_DIR)/Applications:
9797
@rm -f $@
9898
@cd $(@D); $(LN_S) /Applications $(@F)
9999

100-
$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt
100+
$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/OmniCore-Qt
101101

102102
$(OSX_DMG): $(APP_DIST_EXTRAS)
103-
$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "Bitcoin-Qt" -no-pad -r -apple -o $@ dist
103+
$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "OmniCore-Qt" -no-pad -r -apple -o $@ dist
104104

105105
$(APP_DIST_DIR)/.background/background.png:
106106
$(MKDIR_P) $(@D)
107107
$(INSTALL) $(top_srcdir)/contrib/macdeploy/background.png $@
108108
$(APP_DIST_DIR)/.DS_Store:
109109
$(INSTALL) $(top_srcdir)/contrib/macdeploy/DS_Store $@
110110

111-
$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
111+
$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/OmniCore-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
112112
INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2
113113

114114
deploydir: $(APP_DIST_EXTRAS)
@@ -150,7 +150,7 @@ baseline_filtered_combined.info: leveldb_baseline_filtered.info baseline_filtere
150150

151151
test_bitcoin.info: baseline_filtered_combined.info
152152
$(MAKE) -C src/ check
153-
$(LCOV) -c -d $(abs_builddir)/src -t test_bitcoin -o $@
153+
$(LCOV) -c -d $(abs_builddir)/src -t test_omnicore -o $@
154154
$(LCOV) -z -d $(abs_builddir)/src
155155
$(LCOV) -z -d $(abs_builddir)/src/leveldb
156156

‎configure.ac‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ CPPFLAGS="$CPPFLAGS -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_
173173

174174
AC_ARG_WITH([utils],
175175
[AS_HELP_STRING([--with-utils],
176-
[build bitcoin-cli bitcoin-tx (default=yes)])],
176+
[build omnicore-cli bitcoin-tx (default=yes)])],
177177
[build_bitcoin_utils=$withval],
178178
[build_bitcoin_utils=yes])
179179

@@ -185,7 +185,7 @@ AC_ARG_WITH([libs],
185185

186186
AC_ARG_WITH([daemon],
187187
[AS_HELP_STRING([--with-daemon],
188-
[build bitcoind daemon (default=yes)])],
188+
[build omnicore daemon (default=yes)])],
189189
[build_bitcoind=$withval],
190190
[build_bitcoind=yes])
191191

@@ -711,11 +711,11 @@ LIBS="$LIBS_TEMP"
711711

712712
BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path)
713713

714-
AC_MSG_CHECKING([whether to build bitcoind])
714+
AC_MSG_CHECKING([whether to build omnicored])
715715
AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
716716
AC_MSG_RESULT($build_bitcoind)
717717

718-
AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx)])
718+
AC_MSG_CHECKING([whether to build utils (omnicore-cli bitcoin-tx)])
719719
AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes])
720720
AC_MSG_RESULT($build_bitcoin_utils)
721721

@@ -815,7 +815,7 @@ if test x$bitcoin_enable_qt != xno; then
815815
AC_MSG_WARN("xgettext is required to update qt translations")
816816
fi
817817

818-
AC_MSG_CHECKING([whether to build test_bitcoin-qt])
818+
AC_MSG_CHECKING([whether to build test_omnicore-qt])
819819
if test x$use_tests$bitcoin_enable_qt_test = xyesyes; then
820820
AC_MSG_RESULT([yes])
821821
BUILD_TEST_QT="test"
@@ -824,7 +824,7 @@ if test x$bitcoin_enable_qt != xno; then
824824
fi
825825
fi
826826

827-
AC_MSG_CHECKING([whether to build test_bitcoin])
827+
AC_MSG_CHECKING([whether to build test_omnicore])
828828
if test x$use_tests = xyes; then
829829
AC_MSG_RESULT([yes])
830830
BUILD_TEST="test"

‎contrib/gitian-descriptors/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Sanity checks:
2020

2121
Once you've got the right hardware and software:
2222

23-
git clone git://github.com/bitcoin/bitcoin.git
23+
git clone git://github.com/OmniLayer/omnicore.git
2424
git clone git://github.com/devrandom/gitian-builder.git
2525
mkdir gitian-builder/inputs
2626
cd gitian-builder/inputs
@@ -62,5 +62,5 @@ Here's a description of Gavin's setup on OSX 10.6:
6262
5. Still inside Ubuntu, tell gitian-builder to use LXC, then follow the "Once you've got the right hardware and software" instructions above:
6363

6464
export USE_LXC=1
65-
git clone git://github.com/bitcoin/bitcoin.git
65+
git clone git://github.com/OmniLayer/omnicore.git
6666
... etc

‎contrib/gitian-descriptors/gitian-linux.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "bitcoin-linux-0.10"
2+
name: "omnicore-linux-0.10"
33
enable_cache: true
44
suites:
55
- "precise"
@@ -17,8 +17,8 @@ packages:
1717
- "binutils-gold"
1818
reference_datetime: "2013-06-01 00:00:00"
1919
remotes:
20-
- "url": "https://github.com/bitcoin/bitcoin.git"
21-
"dir": "bitcoin"
20+
- "url": "https://github.com/OmniLayer/omnicore.git"
21+
"dir": "omnicore"
2222
files: []
2323
script: |
2424
WRAP_DIR=$HOME/wrapped
@@ -62,7 +62,7 @@ script: |
6262
done
6363
export PATH=${WRAP_DIR}:${PATH}
6464
65-
cd bitcoin
65+
cd omnicore
6666
BASEPREFIX=`pwd`/depends
6767
# Build dependencies for each host
6868
for i in $HOSTS; do
@@ -73,13 +73,13 @@ script: |
7373
./autogen.sh
7474
./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
7575
make dist
76-
SOURCEDIST=`echo bitcoin-*.tar.gz`
76+
SOURCEDIST=`echo omnicore-*.tar.gz`
7777
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
7878
# Correct tar file order
7979
mkdir -p temp
8080
pushd temp
8181
tar xf ../$SOURCEDIST
82-
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
82+
find omnicore-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
8383
popd
8484
8585
ORIGPATH="$PATH"

‎contrib/gitian-descriptors/gitian-osx-signer.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "bitcoin-dmg-signer"
2+
name: "omnicore-dmg-signer"
33
suites:
44
- "precise"
55
architectures:
@@ -10,7 +10,7 @@ packages:
1010
reference_datetime: "2013-06-01 00:00:00"
1111
remotes: []
1212
files:
13-
- "bitcoin-osx-unsigned.tar.gz"
13+
- "omnicore-osx-unsigned.tar.gz"
1414
- "signature.tar.gz"
1515
script: |
1616
WRAP_DIR=$HOME/wrapped
@@ -28,10 +28,10 @@ script: |
2828
chmod +x ${WRAP_DIR}/${prog}
2929
done
3030
31-
UNSIGNED=bitcoin-osx-unsigned.tar.gz
32-
SIGNED=bitcoin-osx-signed.dmg
31+
UNSIGNED=omnicore-osx-unsigned.tar.gz
32+
SIGNED=omnicore-osx-signed.dmg
3333
3434
tar -xf ${UNSIGNED}
3535
./detached-sig-apply.sh ${UNSIGNED} signature.tar.gz
36-
${WRAP_DIR}/genisoimage -no-cache-inodes -D -l -probe -V "Bitcoin-Qt" -no-pad -r -apple -o uncompressed.dmg signed-app
36+
${WRAP_DIR}/genisoimage -no-cache-inodes -D -l -probe -V "OmniCore-Qt" -no-pad -r -apple -o uncompressed.dmg signed-app
3737
${WRAP_DIR}/dmg dmg uncompressed.dmg ${OUTDIR}/${SIGNED}

‎contrib/gitian-descriptors/gitian-osx.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "bitcoin-osx-0.10"
2+
name: "omnicore-osx-0.10"
33
enable_cache: true
44
suites:
55
- "precise"
@@ -20,8 +20,8 @@ packages:
2020
- "libbz2-dev"
2121
reference_datetime: "2013-06-01 00:00:00"
2222
remotes:
23-
- "url": "https://github.com/bitcoin/bitcoin.git"
24-
"dir": "bitcoin"
23+
- "url": "https://github.com/OmniLayer/omnicore.git"
24+
"dir": "omnicore"
2525
files:
2626
- "MacOSX10.7.sdk.tar.gz"
2727
script: |
@@ -68,7 +68,7 @@ script: |
6868
done
6969
export PATH=${WRAP_DIR}:${PATH}
7070
71-
cd bitcoin
71+
cd omnicore
7272
BASEPREFIX=`pwd`/depends
7373
7474
mkdir -p ${BASEPREFIX}/SDKs
@@ -83,14 +83,14 @@ script: |
8383
./autogen.sh
8484
./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
8585
make dist
86-
SOURCEDIST=`echo bitcoin-*.tar.gz`
86+
SOURCEDIST=`echo omnicore-*.tar.gz`
8787
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
8888
8989
# Correct tar file order
9090
mkdir -p temp
9191
pushd temp
9292
tar xf ../$SOURCEDIST
93-
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
93+
find omnicore-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
9494
popd
9595
9696
ORIGPATH="$PATH"
@@ -120,7 +120,7 @@ script: |
120120
popd
121121
122122
make deploy
123-
${WRAP_DIR}/dmg dmg Bitcoin-Qt.dmg ${OUTDIR}/${DISTNAME}-osx-unsigned.dmg
123+
${WRAP_DIR}/dmg dmg OmniCore-Qt.dmg ${OUTDIR}/${DISTNAME}-osx-unsigned.dmg
124124
125125
cd installed
126126
find . -name "lib*.la" -delete

‎contrib/gitian-descriptors/gitian-win.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "bitcoin-win-0.10"
2+
name: "omnicore-win-0.10"
33
enable_cache: true
44
suites:
55
- "precise"
@@ -20,8 +20,8 @@ packages:
2020
- "zip"
2121
reference_datetime: "2013-06-01 00:00:00"
2222
remotes:
23-
- "url": "https://github.com/bitcoin/bitcoin.git"
24-
"dir": "bitcoin"
23+
- "url": "https://github.com/OmniLayer/omnicore.git"
24+
"dir": "omnicore"
2525
files: []
2626
script: |
2727
WRAP_DIR=$HOME/wrapped
@@ -65,7 +65,7 @@ script: |
6565
done
6666
export PATH=${WRAP_DIR}:${PATH}
6767
68-
cd bitcoin
68+
cd omnicore
6969
BASEPREFIX=`pwd`/depends
7070
# Build dependencies for each host
7171
for i in $HOSTS; do
@@ -76,14 +76,14 @@ script: |
7676
./autogen.sh
7777
./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
7878
make dist
79-
SOURCEDIST=`echo bitcoin-*.tar.gz`
79+
SOURCEDIST=`echo omnicore-*.tar.gz`
8080
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
8181
8282
# Correct tar file order
8383
mkdir -p temp
8484
pushd temp
8585
tar xf ../$SOURCEDIST
86-
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
86+
find omnicore-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
8787
popd
8888
8989
ORIGPATH="$PATH"
@@ -100,7 +100,7 @@ script: |
100100
make ${MAKEOPTS}
101101
make deploy
102102
make install-strip
103-
cp -f bitcoin-*setup*.exe $OUTDIR/
103+
cp -f omnicore-*setup*.exe $OUTDIR/
104104
cd installed
105105
mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/
106106
find . -name "lib*.la" -delete

‎contrib/macdeploy/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ This script should not be run manually, instead, after building as usual:
1111
During the process, the disk image window will pop up briefly where the fancy
1212
settings are applied. This is normal, please do not interfere.
1313

14-
When finished, it will produce `Bitcoin-Qt.dmg`.
14+
When finished, it will produce `OmniCore-Qt.dmg`.
1515

0 commit comments

Comments
 (0)