git://git.novaco.in / novacoin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 397737b ee932c6)
Merge branch '0.6.0.x' into 0.6.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Sat, 5 May 2012 16:13:56 +0000 (16:13 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sat, 5 May 2012 16:13:56 +0000 (16:13 +0000)
Conflicts:
bitcoin-qt.pro
contrib/gitian-descriptors/gitian-win32.yml
doc/README
doc/README_windows.txt
share/qt/make_windows_icon.sh
share/setup.nsi
src/bitcoinrpc.cpp
src/main.cpp
src/main.h
src/makefile.linux-mingw
src/net.cpp
src/net.h
src/netbase.h
src/noui.h
src/qt/addressbookpage.cpp
src/qt/bitcoin.cpp
src/qt/bitcoingui.cpp
src/qt/bitcoingui.h
src/qt/bitcoinstrings.cpp
src/qt/guiutil.cpp
src/qt/guiutil.h
src/qt/optionsmodel.cpp
src/qt/qrcodedialog.cpp
src/qt/qtipcserver.cpp
src/script.cpp
src/serialize.h
src/ui_interface.h
src/uint256.h

1  2 
contrib/gitian-descriptors/gitian-win32.yml patch | diff1 | diff2 | blob | history
contrib/gitian-descriptors/gitian.yml patch | diff1 | diff2 | blob | history
src/makefile.mingw patch | diff1 | diff2 | blob | history

diff --combined contrib/gitian-descriptors/gitian-win32.yml
index 9752626,488cc95..a48e54d
--- 1/contrib/gitian-descriptors/gitian-win32.yml
--- 2/contrib/gitian-descriptors/gitian-win32.yml
+++ b/contrib/gitian-descriptors/gitian-win32.yml
@@@ -12,7 -12,7 +12,7 @@@ packages
  - "faketime"
  reference_datetime: "2011-01-30 00:00:00"
  remotes:
- - "url": "https://github.com/bitcoin/bitcoin.git"
+ - "url": "https://git.gitorious.org/+bitcoin-stable-developers/bitcoin/bitcoind-stable.git"
    "dir": "bitcoin"
  files:
  - "qt-win32-4.7.4-gitian.zip"
@@@ -45,30 -45,25 +45,30 @@@ script: 
    #
    cd bitcoin
    mkdir -p $OUTDIR/src
 -  cp -a . $OUTDIR/src
 -  rm -rf $OUTDIR/src/.git
 +  git archive HEAD | tar -x -C $OUTDIR/src
    cp $OUTDIR/src/doc/README_windows.txt $OUTDIR/readme.txt
    cp $OUTDIR/src/COPYING $OUTDIR/license.txt
    export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
    export FAKETIME=$REFERENCE_DATETIME
    export TZ=UTC
 -  $HOME/qt/src/bin/qmake -spec unsupported/win32-g++-cross USE_SSL=1 MINIUPNPC_LIB_PATH=$HOME/build/miniupnpc MINIUPNPC_INCLUDE_PATH=$HOME/build/ BDB_LIB_PATH=$HOME/build/db-4.8.30.NC/build_unix BDB_INCLUDE_PATH=$HOME/build/db-4.8.30.NC/build_unix BOOST_LIB_PATH=$HOME/build/boost_1_47_0/stage/lib BOOST_INCLUDE_PATH=$HOME/build/boost_1_47_0 BOOST_LIB_SUFFIX=-mt-s BOOST_THREAD_LIB_SUFFIX=_win32-mt-s OPENSSL_LIB_PATH=$HOME/build/openssl-1.0.1b OPENSSL_INCLUDE_PATH=$HOME/build/openssl-1.0.1b/include QRENCODE_LIB_PATH=$HOME/build/qrencode-3.2.0/.libs QRENCODE_INCLUDE_PATH=$HOME/build/qrencode-3.2.0 USE_QRCODE=1 INCLUDEPATH=$HOME/build DEFINES=BOOST_THREAD_USE_LIB BITCOIN_NEED_QT_PLUGINS=1 QMAKE_LRELEASE=lrelease QMAKE_CXXFLAGS=-frandom-seed=bitcoin QMAKE_LFLAGS=-frandom-seed=bitcoin
 +  $HOME/qt/src/bin/qmake -spec unsupported/win32-g++-cross MINIUPNPC_LIB_PATH=$HOME/build/miniupnpc MINIUPNPC_INCLUDE_PATH=$HOME/build/ BDB_LIB_PATH=$HOME/build/db-4.8.30.NC/build_unix BDB_INCLUDE_PATH=$HOME/build/db-4.8.30.NC/build_unix BOOST_LIB_PATH=$HOME/build/boost_1_47_0/stage/lib BOOST_INCLUDE_PATH=$HOME/build/boost_1_47_0 BOOST_LIB_SUFFIX=-mt-s BOOST_THREAD_LIB_SUFFIX=_win32-mt-s OPENSSL_LIB_PATH=$HOME/build/openssl-1.0.1b OPENSSL_INCLUDE_PATH=$HOME/build/openssl-1.0.1b/include QRENCODE_LIB_PATH=$HOME/build/qrencode-3.2.0/.libs QRENCODE_INCLUDE_PATH=$HOME/build/qrencode-3.2.0 USE_QRCODE=1 INCLUDEPATH=$HOME/build DEFINES=BOOST_THREAD_USE_LIB BITCOIN_NEED_QT_PLUGINS=1 QMAKE_LRELEASE=lrelease QMAKE_CXXFLAGS=-frandom-seed=bitcoin QMAKE_LFLAGS=-frandom-seed=bitcoin USE_BUILD_INFO=1
    make $MAKEOPTS
    cp release/bitcoin-qt.exe $OUTDIR/
    #
    cd src
    export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
    export FAKETIME=$REFERENCE_DATETIME
    export TZ=UTC
 -  make -f makefile.linux-mingw $MAKEOPTS DEPSDIR=$HOME/build bitcoind.exe USE_SSL=1 USE_UPNP=0
 +  make -f makefile.linux-mingw $MAKEOPTS DEPSDIR=$HOME/build bitcoind.exe USE_UPNP=0 DEBUGFLAGS="-frandom-seed=bitcoin"
    i586-mingw32msvc-strip bitcoind.exe
 -  makensis ../share/setup.nsi
 -  cp ../share/bitcoin-*-win32-setup.exe $OUTDIR/
    mkdir $OUTDIR/daemon
    cp bitcoind.exe $OUTDIR/daemon
 +  cd ..
 +  mkdir nsis
 +  git archive HEAD | tar -x -C nsis
 +  cd nsis/src
 +  mkdir ../release
 +  cp ../../release/* ../release/
 +  cp ../../src/*.exe .
 +  makensis ../share/setup.nsi
 +  cp ../share/bitcoin-*-win32-setup.exe $OUTDIR/
diff --combined contrib/gitian-descriptors/gitian.yml
index 8243c5c,52056b3..36a2000
--- 1/contrib/gitian-descriptors/gitian.yml
--- 2/contrib/gitian-descriptors/gitian.yml
+++ b/contrib/gitian-descriptors/gitian.yml
@@@ -20,7 -20,7 +20,7 @@@ packages
  - "libpng12-dev"
  reference_datetime: "2011-01-30 00:00:00"
  remotes:
- - "url": "https://github.com/bitcoin/bitcoin.git"
+ - "url": "https://git.gitorious.org/+bitcoin-stable-developers/bitcoin/bitcoind-stable.git"
    "dir": "bitcoin"
  files:
  - "miniupnpc-1.6.tar.gz"
@@@ -42,14 -42,16 +42,14 @@@ script: 
    #
    cd bitcoin
    mkdir -p $OUTDIR/src
 -  cp -a . $OUTDIR/src
 -  rm -rf $OUTDIR/src/.git
 +  git archive HEAD | tar -x -C $OUTDIR/src
    cp $OUTDIR/src/doc/README $OUTDIR
    cp $OUTDIR/src/COPYING $OUTDIR
    cd src
 -  sed 's/$(DEBUGFLAGS)//' -i makefile.unix
 -  make -f makefile.unix STATIC=1 OPENSSL_INCLUDE_PATH="$INSTDIR/include" OPENSSL_LIB_PATH="$INSTDIR/lib" $MAKEOPTS bitcoind USE_UPNP=0 USE_SSL=1
 +  make -f makefile.unix STATIC=1 OPENSSL_INCLUDE_PATH="$INSTDIR/include" OPENSSL_LIB_PATH="$INSTDIR/lib" $MAKEOPTS bitcoind USE_UPNP=0 DEBUGFLAGS=
    mkdir -p $OUTDIR/bin/$GBUILD_BITS
    install -s bitcoind $OUTDIR/bin/$GBUILD_BITS
    cd ..
 -  qmake INCLUDEPATH="$INSTDIR/include" LIBS="-L$INSTDIR/lib" RELEASE=1 USE_SSL=1 USE_QRCODE=1
 +  qmake INCLUDEPATH="$INSTDIR/include" LIBS="-L$INSTDIR/lib" RELEASE=1 USE_QRCODE=1
    make $MAKEOPTS
    install bitcoin-qt $OUTDIR/bin/$GBUILD_BITS
diff --combined src/makefile.mingw
index 917eb12,7496e0a..1ca5900
--- 1/src/makefile.mingw
--- 2/src/makefile.mingw
+++ b/src/makefile.mingw
@@@ -7,12 -7,12 +7,12 @@@ USE_UPNP:=
  INCLUDEPATHS= \
   -I"C:\boost-1.47.0-mgw" \
   -I"C:\db-4.8.30.NC-mgw\build_unix" \
-  -I"C:\openssl-1.0.0d-mgw\include"
+  -I"C:\openssl-1.0.1b-mgw\include"
  
  LIBPATHS= \
   -L"C:\boost-1.47.0-mgw\stage\lib" \
   -L"C:\db-4.8.30.NC-mgw\build_unix" \
-  -L"C:\openssl-1.0.0d-mgw"
+  -L"C:\openssl-1.0.1b-mgw"
  
  LIBS= \
   -l boost_system-mgw45-mt-s-1_47 \
@@@ -23,11 -23,10 +23,11 @@@
   -l ssl \
   -l crypto
  
 -DEFS=-DWIN32 -D_WINDOWS -DNOPCH -DUSE_SSL -DBOOST_THREAD_USE_LIB
 +DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB
  DEBUGFLAGS=-g
  CFLAGS=-mthreads -O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
  
 +TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
  
  ifdef USE_UPNP
   INCLUDEPATHS += -I"C:\miniupnpc-1.6-mgw"
@@@ -42,7 -41,6 +42,7 @@@ LIBS += -l kernel32 -l user32 -l gdi32 
  HEADERS = $(wildcard *.h)
  
  OBJS= \
 +    obj/version.o \
      obj/checkpoints.o \
      obj/netbase.o \
      obj/addrman.o \
@@@ -59,9 -57,7 +59,9 @@@
      obj/rpcdump.o \
      obj/script.o \
      obj/util.o \
 -    obj/wallet.o
 +    obj/wallet.o \
 +    obj/walletdb.o \
 +    obj/noui.o
  
  
  all: bitcoind.exe
@@@ -72,16 -68,16 +72,16 @@@ obj/%.o: %.cpp $(HEADERS
  bitcoind.exe: $(OBJS:obj/%=obj/%)
        g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
  
 -obj/test/test_bitcoin.o: $(wildcard test/*.cpp) $(HEADERS)
 -      g++ -c $(CFLAGS) -o $@ test/test_bitcoin.cpp
 +TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
  
 -test_bitcoin.exe: obj/test/test_bitcoin.o $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
 -      g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
 +obj-test/%.o: test/%.cpp $(HEADERS)
 +      g++ -c $(TESTDEFS) $(CFLAGS) -o $@ $<
 +
 +test_bitcoin.exe: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
 +      g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework $(LIBS)
  
  clean:
        -del /Q bitcoind test_bitcoin
        -del /Q obj\*
 -      -del /Q obj\nogui\*
 -      -del /Q obj\test\*
 -      -del /Q test\*.o
 -      -del /Q headers.h.gch
 +      -del /Q obj-test\*
 +      -del /Q build.h
Novacoin client