AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-23 01:49:53 +03:00
Code Releases Activity

Merge PR #609: another attempt to fix launchpad builds

Browse Source
This commit is contained in:
Davide Beatrici 2018-08-05 16:55:34 +02:00 committed by GitHub
commit 828d3b2ffb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -8,7 +8,7 @@ env:
matrix: matrix:
include: include:
- env: OPENSSL_VERSION="1.0.2o" - env: OPENSSL_VERSION="1.0.2o" BUILD_DEB="1"
os: linux os: linux
compiler: gcc compiler: gcc
- env: OPENSSL_VERSION="1.1.0f" - env: OPENSSL_VERSION="1.1.0f"
@ -40,7 +40,7 @@ matrix:
addons: addons:
apt: apt:
packages: [ debhelper ] packages: [ debhelper, devscripts, fakeroot, cmake3, dh-exec ]
cache: cache:
directories: directories:
@ -58,4 +58,4 @@ script:
- ./configure - ./configure
- make -C tmp - make -C tmp
- ldd bin/vpnserver/vpnserver - ldd bin/vpnserver/vpnserver
- dh build-arch - if [ "${BUILD_DEB}" = "1" ]; then debuild -i -us -uc -b; fi

8
debian/rules vendored
View File

@ -1,8 +1,9 @@
#!/usr/bin/make -f #!/usr/bin/make -f
define generate_stub define generate_stub
mkdir -p debian/usr/bin
echo '#!/bin/sh' > debian/usr/bin/$(1) echo '#!/bin/sh' > debian/usr/bin/$(1)
echo '/usr/libexec/softether/$(1)/$(1) "$@"' >> debian/usr/bin/$(1) echo '/usr/libexec/softether/$(1)/$(1) "$$@"' >> debian/usr/bin/$(1)
echo 'exit $?' >> debian/usr/bin/$(1) echo 'exit $?' >> debian/usr/bin/$(1)
chmod +x debian/usr/bin/$(1) chmod +x debian/usr/bin/$(1)
endef endef
@ -13,10 +14,11 @@ export export CMAKE_INSTALL_PREFIX=../debian/usr
%: %:
dh $@ dh $@
override_dh_auto_make: override_dh_auto_configure:
make -C tmp cmake .
override_dh_auto_install: override_dh_auto_install:
dh_auto_install
$(call generate_stub,vpnserver) $(call generate_stub,vpnserver)
$(call generate_stub,vpnbridge) $(call generate_stub,vpnbridge)
$(call generate_stub,vpncmd) $(call generate_stub,vpncmd)

4
debian/softether-vpnbridge.install vendored
View File

@ -1,5 +1,5 @@
#! /usr/bin/dh-exec #! /usr/bin/dh-exec
debian/usr/libexec/softether/vpnbridge/vpnbridge usr/libexec/softether/vpnbridge/ debian/tmp/usr/local/libexec/softether/vpnbridge/vpnbridge usr/libexec/softether/vpnbridge/
debian/usr/libexec/softether/vpnbridge/hamcore.se2 usr/libexec/softether/vpnbridge/ debian/tmp/usr/local/libexec/softether/vpnbridge/hamcore.se2 usr/libexec/softether/vpnbridge/
debian/usr/bin/vpnbridge usr/bin/ debian/usr/bin/vpnbridge usr/bin/

4
debian/softether-vpnclient.install vendored
View File

@ -1,5 +1,5 @@
#! /usr/bin/dh-exec #! /usr/bin/dh-exec
debian/usr/libexec/softether/vpnclient/vpnclient usr/libexec/softether/vpnclient/ debian/tmp/usr/local/libexec/softether/vpnclient/vpnclient usr/libexec/softether/vpnclient/
debian/usr/libexec/softether/vpnclient/hamcore.se2 usr/libexec/softether/vpnclient/ debian/tmp/usr/local/libexec/softether/vpnclient/hamcore.se2 usr/libexec/softether/vpnclient/
debian/usr/bin/vpnclient usr/bin/ debian/usr/bin/vpnclient usr/bin/

7
debian/softether-vpncmd.install vendored
View File

@ -1,5 +1,4 @@
#! /usr/bin/dh-exec #! /usr/bin/dh-exec
debian/usr/libexec/softether/vpncmd/vpncmd usr/libexec/softether/vpncmd/ debian/tmp/usr/local/libexec/softether/vpncmd/vpncmd usr/libexec/softether/vpncmd/
debian/usr/libexec/softether/vpncmd/hamcore.se2 usr/libexec/softether/vpncmd/ debian/tmp/usr/local/libexec/softether/vpncmd/hamcore.se2 usr/libexec/softether/vpncmd/
debian/usr/bin/vpncmd usr/bin/ debian/tmp/usr/local/bin/vpncmd usr/bin/

5
debian/softether-vpnserver.install vendored
View File

@ -1,5 +1,4 @@
#! /usr/bin/dh-exec #! /usr/bin/dh-exec
debian/usr/libexec/softether/vpnserver/vpnserver usr/libexec/softether/vpnserver/ debian/tmp/usr/local/libexec/softether/vpnserver/vpnserver usr/libexec/softether/vpnserver/
debian/usr/libexec/softether/vpnserver/hamcore.se2 usr/libexec/softether/vpnserver/ debian/tmp/usr/local/libexec/softether/vpnserver/hamcore.se2 usr/libexec/softether/vpnserver/
debian/usr/bin/vpnserver usr/bin/ debian/usr/bin/vpnserver usr/bin/