Merge pull request #50 from dryabov/master

Twister 0.9.28

Gruntfile.js

@@ -19,7 +19,7 @@ module.exports = function (grunt) {
         // Metadata.
         pkg: grunt.file.readJSON('package.json'),
         app: grunt.file.readJSON('app/package.json'),
-        twister_win_ia32_url: 'http://twisterd.net/webkit/twister-0.9.27-win32.zip',
+        twister_win_ia32_url: 'http://twisterd.net/webkit/twister-0.9.28-win32.zip',
         twister_mac_x64_url: 'http://twisterd.net/osx_bin.zip',
         twister_bootstrap_db48_url: 'http://twisterd.net/webkit/bootstrap48.zip',
         nsis_path: process.platform === 'win32' ? (process.arch === 'x64' ? '%ProgramFiles(x86)%' : '%ProgramFiles%') + '\\NSIS\\' : '',

app/package.json

@@ -1,7 +1,7 @@
 {
     "main": "index.html",
     "name": "twister",
-    "version": "0.9.27.0",
+    "version": "0.9.28.0",
     "description": "P2P microbloging system",
     "chromium-args": "--auth-schemes='basic'",
     "window": {

build-win/gitian-win.yml

@@ -0,0 +1,79 @@
+---
+name: "twister"
+suites:
+- "precise"
+architectures:
+- "amd64"
+packages:
+- "mingw-w64"
+- "g++-mingw-w64"
+- "git-core"
+- "unzip"
+- "zip"
+- "nsis"
+- "faketime"
+- "autoconf2.13"
+- "libtool"
+- "automake"
+- "pkg-config"
+- "bsdmainutils"
+
+reference_datetime: "2013-06-01 00:00:00"
+remotes:
+- "url": "https://github.com/miguelfreitas/twister-core.git"
+  "dir": "twister-core"
+files:
+- "boost-win32-1.55.0-gitian-r6.zip"
+- "boost-win64-1.55.0-gitian-r6.zip"
+- "twister-deps-win32-gitian-r13.zip"
+- "twister-deps-win64-gitian-r13.zip"
+script: |
+  # Defines
+  export TZ=UTC
+  INDIR=$HOME/build
+  OPTFLAGS='-O2 -static -static-libgcc -static-libstdc++'
+  TEMPDIR="$HOME/tempdir"
+  for BITS in 32; do # for architectures [original list: 32 64]
+    #
+    STAGING=$HOME/staging${BITS}
+    BUILDDIR=$HOME/build${BITS}
+    BINDIR=$OUTDIR/$BITS
+    if [ "$BITS" == "32" ]; then
+      HOST=i686-w64-mingw32
+    else
+      HOST=x86_64-w64-mingw32
+    fi
+    export PATH=$STAGING/host/bin:$PATH
+    mkdir -p $STAGING $BUILDDIR $BINDIR
+    #
+    cd $STAGING
+    unzip $INDIR/boost-win${BITS}-1.55.0-gitian-r6.zip
+    unzip $INDIR/twister-deps-win${BITS}-gitian-r13.zip
+    # Build platform-dependent executables from source archive
+    cd $BUILDDIR
+    rm -rf distsrc
+    cp -a $HOME/build/twister-core distsrc
+    mkdir -p distsrc
+    cd distsrc
+    ./autotool.sh
+    # original configure command doesn't contain --enable-debug=no option
+    ./configure --bindir=$BINDIR --prefix=$STAGING --host=$HOST --with-boost=$STAGING --with-openssl=$STAGING CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="${OPTFLAGS}" --without-boost-locale --enable-debug=no
+    #export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+    #export FAKETIME=$REFERENCE_DATETIME
+    make $MAKEOPTS
+    strip twisterd.exe
+    cp -f twisterd.exe $BINDIR/
+    unset LD_PRELOAD
+    unset FAKETIME
+  done # for BITS in
+
+  # sort distribution tar file and normalize user/group/mtime information for deterministic output
+  mkdir -p $OUTDIR/src
+  rm -rf $TEMPDIR
+  mkdir -p $TEMPDIR
+  cd $TEMPDIR
+  #tar -xvf $HOME/build/twister/$DISTNAME | sort | tar --no-recursion -cT /dev/stdin --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 mtime="$REFERENCE_DATETIME" | gzip -n > $OUTDIR/src/$DISTNAME
+  cd $OUTDIR
+  find $OUTDIR | sort | zip -X@ /home/ubuntu/out/twister-win-gitian.zip
+
+

package.json

@@ -1,6 +1,6 @@
 {
     "name": "twister",
-    "version": "0.9.27",
+    "version": "0.9.28",
     "description": "P2P microbloging system",
     "licenses": [
         {