EdgeVPNio
/
tools
mirror of https://github.com/EdgeVPNio/tools.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Major changes for the versioning tools

pull/8/head
Rajath Ganesh 2020-11-05 13:30:50 -05:00
parent 90a8deb66b
commit 9eb5b2b88e
4 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
debian-package/deb-gen
View File

@ -1,17 +1,4 @@
#!/bin/sh #!/bin/sh
cat <<! > edge-vpnio/DEBIAN/control
Package: edge-vpnio
Name: EdgeVPNio
Version: 20.7
Maintainer: <ip.over.p2p@gmail.com>
Architecture: $(dpkg --print-architecture)
Homepage: http://edgevpnio.github.io
Depends: python3.8, python3-dev, python3-venv, python3-pip, iproute2, openvswitch-switch, bridge-utils
Description: Virtual Overlay Networking.
EdgeVPN is an open-source user-centric software virtual network allowing end users to define and create their own virtual private networks (VPNs). EdgeVPNio virtual networks provide end-to-end tunneling of IP or Ethernet over Tincan links setup and managed through a control API to create various software-defined VPN overlays.
Tag: P2P Overlay Networking
!
dpkg-deb --build --root-owner-group edge-vpnio . dpkg-deb --build --root-owner-group edge-vpnio .
rm -f edge-vpnio/DEBIAN/control rm -f edge-vpnio/DEBIAN/control

14
debian-package/debian-config 100644
View File

@ -0,0 +1,14 @@
#!/bin/sh
type <<! > edge-vpnio/DEBIAN/control
Package: edge-vpnio
Name: EdgeVPNio
Version : 20.10.0.1604343933-dev
Maintainer: <ip.over.p2p@gmail.com>
Architecture: $(dpkg --print-architecture)
Homepage: http://edgevpnio.github.io
Depends: python3.8, python3-dev, python3-venv, python3-pip, iproute2, openvswitch-switch, bridge-utils
Description: Virtual Overlay Networking.
EdgeVPN is an open-source user-centric software virtual network allowing end users to define and create their own virtual private networks (VPNs). EdgeVPNio virtual networks provide end-to-end tunneling of IP or Ethernet over Tincan links setup and managed through a control API to create various software-defined VPN overlays.
Tag: P2P Overlay Networking
!

21
scripts/Versioning.py
View File

@ -1,5 +1,6 @@
import os import os
import time import time
import subprocess
import fileinput import fileinput
import sys import sys
from scripts.tool_config import CONTROL_VER as control from scripts.tool_config import CONTROL_VER as control
@ -23,8 +24,8 @@ class Versioning:
wd = os.getcwd() wd = os.getcwd()
location1 = "~/workspace/EdgeVPNIO/evio/tincan/trunk/include/tincan_version.h" location1 = "~/workspace/EdgeVPNIO/evio/tincan/trunk/include/tincan_version.h"
#location = '.' location = '.'
os.chdir(location1) os.chdir(location)
# version_h_r = open("tincan_version.h", 'r').read() # version_h_r = open("tincan_version.h", 'r').read()
# version_h_w = open("tincan_version.h", 'w') # version_h_w = open("tincan_version.h", 'w')
# m = version_h_r.replace("static const uint16_t kTincanVerMjr = 0;", "static const uint16_t kTincanVerMjr = " + major + ";") # m = version_h_r.replace("static const uint16_t kTincanVerMjr = 0;", "static const uint16_t kTincanVerMjr = " + major + ";")
@ -96,17 +97,25 @@ class Versioning:
c_file.write("EVIO_VER_BLD = " + str(build) + "\n") c_file.write("EVIO_VER_BLD = " + str(build) + "\n")
c_file.write("EVIO_VER_CTL = " + str(control) + "\n") c_file.write("EVIO_VER_CTL = " + str(control) + "\n")
os.replace('Version.py', location2) os.replace('Version.py', location2)
os.chdir(wd)
os.chdir("../debian-package") os.chdir("../debian-package")
for line in fileinput.input('./deb-gen', inplace=True): # for line in fileinput.input('./deb-gen', inplace=True):
# if line.strip().startswith('Version'):
# if official:
# line = 'Version : ' + ver + '\n'
# else:
# line = 'Version : ' + ver + '-dev\n'
# sys.stdout.write(line)
subprocess.run("./debian-config")
for line in fileinput.input('./edge-vpnio/DEBIAN/control', inplace=True):
if line.strip().startswith('Version'): if line.strip().startswith('Version'):
if official: if official:
line = 'Version : ' + ver + '\n' line = 'Version : ' + ver + '\n'
else: else:
line = 'Version : ' + ver + '-dev\n' line = 'Version : ' + ver + '-dev\n'
sys.stdout.write(line) sys.stdout.write(line)
#os.replace('./temp', './deb-gen') os.chdir(wd)
# os.rename(r'./temp', r'./deb-gen') # os.replace('./temp', './deb-gen')
# os.rename(r'./temp', r'./deb-gen')
if __name__ == '__main__': if __name__ == '__main__':

7
scripts/evtool-v20.7.2
View File

@ -98,8 +98,13 @@ function make_dkrimg
mkdir -p ~/workspace/out/docker-image mkdir -p ~/workspace/out/docker-image
cd ~/workspace/$EdgeVPNIO/tools cd ~/workspace/$EdgeVPNIO/tools
mv ../../out/debian-package/edge-vpnio_20.7_amd64.deb docker-image/ && \ mv ../../out/debian-package/edge-vpnio_20.7_amd64.deb docker-image/ && \
wd=$(pwd)
cd ../../out/debian-package/
NAME=`ls | grep *.deb`
version=$(echo $NAME | cut -d_ -f2)
cd $wd
docker build -f ./docker-image/evio-base.Dockerfile -t edgevpnio/evio-base:1.0 ../../out/docker-image && \ docker build -f ./docker-image/evio-base.Dockerfile -t edgevpnio/evio-base:1.0 ../../out/docker-image && \
docker build -f ./docker-image/evio-node.Dockerfile -t edgevpnio/evio-node:20.7.3 ../../out/docker-image docker build -f ./docker-image/evio-node.Dockerfile -t edgevpnio/evio-node:"$version" ../../out/docker-image
} }