Skip to content

Commit

Permalink
Merge pull request #149 from aionnetwork/version
Browse files Browse the repository at this point in the history 
Version management refine
  • Loading branch information
@aion-jin
aion-jin authored Mar 7, 2018
2 parents 20e493b + 4feca88 commit 1912045
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 104 deletions.
91 changes: 0 additions & 91 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,6 @@

<target name="clean_build" depends="clean, mod_build, build" />

<target name="clean_build_fatjar" depends="clean, mod_build, build_fatjar" />

<target name="build_test" depends="build, test" />

<target name="mod_build">
Expand Down Expand Up @@ -246,94 +244,6 @@
</ant>
</target>

<target name="build_fatjar" depends="mod_build">

<mkdir dir="${dir.buildfile}" />
<mkdir dir="${dir.native}/linux/equihash" />
<mkdir dir="${dir.build.native}/linux/equihash" />

<copy includeemptydirs="false" todir="./build/native">
<fileset dir="./modAionImpl/src/org/aion/equihash/native" />
</copy>

<javac debug="true" debuglevel="source,lines,vars" destdir="${dir.buildfile}" includeantruntime="false">
<compilerarg line="--add-modules=java.xml.bind -h ${dir.buildfile}/native" />
<src path="./modAion/src" />
<src path="./modAionBase/src" />
<src path="./modMcf/src" />
<src path="./modAionImpl/src" />
<src path="./modApiServer/src" />
<src path="./modBoot/src" />
<src path="./modCrypto/src" />
<src path="./modDbImpl/src" />
<src path="./modEvtMgr/src" />
<src path="./modEvtMgrImpl/src" />
<src path="./modLogger/src" />
<src path="./modP2p/src" />
<src path="./modP2pImpl/src" />
<src path="./modRlp/src" />
<src path="./modTxPool/src" />
<src path="./modTxPoolImpl/src" />
<src path="./aion_fastvm/java/src" />
<classpath refid="cp" />
</javac>
<jar destfile="${dir.libfile}/aion.jar" filesetmanifest="mergewithoutmain">
<manifest>
<attribute name="Main-Class" value="org.aion.Aion" />
<attribute name="Class-Path" value="." />
</manifest>
<fileset dir="${dir.buildfile}" />

<zipfileset excludes="META-INF/*.SF" src="${dir.libfile}/slf4j-api-1.7.25.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.libfile}/commons-codec-1.10.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.libfile}/commons-collections4-4.0.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.libfile}/commons-lang3-3.4.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.libfile}/guava-19.0.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.libfile}/h2-mvstore-1.4.196.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.libfile}/jctools-core-1.2.1.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.libfile}/leveldb-api-0.9.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.libfile}/leveldbjni-all-1.18.3.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.libfile}/logback-core-1.2.3.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.libfile}/logback-classic-1.2.3.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.libfile}/libnmapdb.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.libfile}/libnsc.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.libfile}/libnzmq.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.libfile}/libminiupnp/miniupnpc_linux.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.libfile}/protobuf-java-3.5.0.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.libfile}/libJson.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.modfile}/modEvtMgr.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.modfile}/modEvtMgrImpl.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.modfile}/modLogger.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.modfile}/modP2p.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.modfile}/modP2pImpl.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.modfile}/modAionBase.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.modfile}/modTxPool.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.modfile}/modTxPoolImpl.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.modfile}/modDbImpl.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.modfile}/modRlp.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.modfile}/modCrypto.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.modfile}/modAion.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.modfile}/modAionImpl.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.modfile}/modApiServer.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.modfile}/modBoot.jar" />
<zipfileset excludes="META-INF/*.SF" src="${dir.modfile}/modMcf.jar" />
</jar>


<property environment="env" />
<fail unless="env.JAVA_HOME" message="JAVA_HOME not set" />

<!-- Set environment variable for LD_LIBRARY_PATH-->


<exec executable="g++" failonerror="true">
<!-- <arg line="-fPIC -shared -I${env.JAVA_HOME}/include -I${env.JAVA_HOME}/include/linux -I./build/native -march=native -m64 -std=c++11 -Wall -Wno-deprecated-declarations -D_POSIX_C_SOURCE=200112L -O3 ./build/native/equi.h ./build/native/equi_miner.h ./build/native/equiMiner.cpp ./build/native/blake/blake2b.cpp -lsodium -o ./build/native/equiMiner.so "/> -->
<!-- <arg line="-fPIC -shared -I${env.JAVA_HOME}/include -I${env.JAVA_HOME}/include/linux -I./build/native -I${dir.native}/linux/sodium -march=native -m64 -std=c++11 -Wall -Wno-deprecated-declarations -D_POSIX_C_SOURCE=200112L -O3 ./build/native/equi.h ./build/native/equi_miner.h ./build/native/equiMiner.cpp ./build/native/blake/blake2b.cpp -L${dir.workspace}/native/linux/sodium -lsodium -o ./build/native/equiMiner.so -Wl,-rpath,${dir.native}/linux/sodium"/> -->
<arg line="-fPIC -shared -I${env.JAVA_HOME}/include -I${env.JAVA_HOME}/include/linux -I${dir.build.native} -I${dir.native}/linux/sodium -mtune=generic -m64 -std=c++11 -Wall -Wno-deprecated-declarations -D_POSIX_C_SOURCE=200112L -O3 ./build/native/equi.h ./build/native/equi_miner.h ./build/native/equiMiner.cpp -L${dir.workspace}/native/linux/sodium -lsodium -o ${dir.native}/linux/equihash/equiMiner.so -Wl,-rpath,${dir.native}/linux/sodium" />
</exec>

</target>

<target name="build" depends="mod_build">
<mkdir dir="${dir.buildfile}" />
<mkdir dir="${dir.native}/linux/equihash" />
Expand Down Expand Up @@ -371,7 +281,6 @@
</target>

<target name="pack_build">
<antcall target="pre_build" />
<antcall target="clean_build">
<param name="compile.debug" value="off" />
</antcall>
Expand Down
16 changes: 16 additions & 0 deletions modAionImpl/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
<target name="build">
<mkdir dir="${dir.dest}"/>
<mkdir dir="${dir.native}"/>
<antcall target="pre_build" />
<javac debug="true" debuglevel="source,lines,vars" includeantruntime="false" release="9" srcdir="./"
destdir="${dir.dest}" includes="src/**/*.java,module-info.java">
<compilerarg line="--add-modules=java.xml.bind -h ${dir.native}"/>
Expand Down Expand Up @@ -122,8 +123,23 @@
<move includeemptydirs="false" todir="${dir.mod}">
<file file="modAionImpl.jar"/>
</move>

<antcall target="post_build" />
</target>

<target name="pre_build">
<echo message="execute prebuild script"/>
<exec executable="/bin/bash">
<arg value="../script/prebuild.sh" />
</exec>
</target>

<target name="post_build">
<echo message="execute postbuild script"/>
<exec executable="/bin/bash">
<arg value="../script/postbuild.sh" />
</exec>
</target>

<target name="build_v8">
<mkdir dir="${dir.dest}"/>
Expand Down
3 changes: 1 addition & 2 deletions modAionImpl/src/org/aion/zero/impl/AionHub.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ public class AionHub {
private static final Logger LOG = LoggerFactory.getLogger(LogEnum.GEN.name());

private static final Logger syncLog = AionLoggerFactory.getLogger(LogEnum.SYNC.name());
public static final String VERSION = "0.1.14";

private IP2pMgr p2pMgr;

Expand Down Expand Up @@ -386,7 +385,7 @@ public IP2pMgr getP2pMgr() {
}

public static String getRepoVersion() {
return AionRepositoryImpl.VERSION;
return Version.REPO_VERSION;
}

public AionBlock getStartingBlock() {
Expand Down
6 changes: 3 additions & 3 deletions modAionImpl/src/org/aion/zero/impl/cli/Cli.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.aion.base.util.Hex;
import org.aion.mcf.config.Cfg;
import org.aion.zero.impl.AionHub;
import org.aion.zero.impl.Version;
import org.aion.zero.impl.db.RecoveryUtils;
import org.aion.crypto.ECKey;
import org.aion.crypto.ECKeyFac;
Expand Down Expand Up @@ -132,10 +133,9 @@ public int call(final String[] args, final Cfg cfg) {
case "-v":
System.out.println("\nVersion");
System.out.println("--------------------------------------------");
System.out.println(AionHub.VERSION);
break;
// Don't put break here!!
case "--version":
System.out.println(AionHub.VERSION);
System.out.println(Version.KERNEL_VERSION);
break;
default:
System.out.println("Unable to parse the input arguments");
Expand Down
3 changes: 2 additions & 1 deletion modAionImpl/src/org/aion/zero/impl/config/CfgAion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.aion.zero.impl.AionGenesis;
import org.aion.zero.impl.AionHub;
import org.aion.zero.impl.GenesisBlockLoader;
import org.aion.zero.impl.Version;

/**
* @author chris
Expand All @@ -52,7 +53,7 @@ public final class CfgAion extends Cfg {
private CfgAion() {
this.mode = "aion";
this.id = UUID.randomUUID().toString();
this.version = AionHub.VERSION;
this.version = Version.KERNEL_VERSION;
this.net = new CfgNet();
this.consensus = new CfgConsensusPow();
this.sync = new CfgSync();
Expand Down
2 changes: 0 additions & 2 deletions modAionImpl/src/org/aion/zero/impl/db/AionRepositoryImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ public class AionRepositoryImpl extends AbstractRepository<AionBlock, A0BlockHea

private TransactionStore<AionTransaction, AionTxReceipt, AionTxInfo> transactionStore;

public static final String VERSION = "0.1.0";

/**
* used by getSnapShotTo
*
Expand Down
3 changes: 2 additions & 1 deletion modApiServer/src/org/aion/api/server/pb/ApiAion0.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import org.aion.p2p.INode;
import org.aion.solidity.Abi;
import org.aion.zero.impl.AionHub;
import org.aion.zero.impl.Version;
import org.aion.zero.impl.blockchain.IAionChain;
import org.aion.zero.impl.types.AionBlock;
import org.aion.zero.impl.types.AionBlockSummary;
Expand Down Expand Up @@ -215,7 +216,7 @@ public byte[] process(byte[] request, byte[] socketId) {
// TODO : create query API for every module
Message.rsp_protocolVersion rsp = Message.rsp_protocolVersion.newBuilder()
.setApi(String.valueOf(this.getApiVersion())).setDb(AionHub.getRepoVersion())
.setKernel(AionHub.VERSION).setMiner(EquihashMiner.VERSION)
.setKernel(Version.KERNEL_VERSION).setMiner(EquihashMiner.VERSION)
.setNet(this.ac.getAionHub().getP2pMgr().version())
.setTxpool(this.ac.getAionHub().getPendingState().getVersion()).setVm("0.1.0").build();

Expand Down
1 change: 1 addition & 0 deletions script/postbuild.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
git checkout -- src/org/aion/zero/impl/Version.java
1 change: 0 additions & 1 deletion script/postpack.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@ mv ${BIN_NAME} "aion-v${VER}-$(date +%Y-%m-%d).tar.bz2"
rm -fr aion

cd ..
git checkout -- ./modAionImpl/src/org/aion/zero/impl/AionHub.java
13 changes: 10 additions & 3 deletions script/prebuild.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# append the git revision into the kernel version number
GITVER=$(git log -1 --format="%h")
TOKEN="public static final String VERSION ="
sed -i -r "/$TOKEN/ s/.{2}$//" ./modAionImpl/src/org/aion/zero/impl/AionHub.java
sed -i "/$TOKEN/ s/$/.$GITVER\";/" ./modAionImpl/src/org/aion/zero/impl/AionHub.java
TOKEN="public static final String KERNEL_VERSION ="
sed -i -r "/$TOKEN/ s/.{2}$//" src/org/aion/zero/impl/Version.java
sed -i "/$TOKEN/ s/$/.$GITVER\";/" src/org/aion/zero/impl/Version.java

TOKEN2="public static final boolean FORK ="
REMOTE_URL=$(git remote -v | tail -n 1 | awk '{print $2}')
AION_REPO="https://github.com/aionnetwork/aion"
if [ "$REMOTE_URL" != "$AION_REPO" ]; then
sed -i -r "/$TOKEN2/ s/false/true/g" src/org/aion/zero/impl/Version.java
fi

0 comments on commit 1912045

Please sign in to comment.