From a18ab70fba3a81c8dbfd62ccd16a0c23665c43ad Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sun, 28 Jun 2015 08:28:42 +0200 Subject: [PATCH] contrib: remove third party files from main src dir --- Makefile | 2 ++ contrib/Makefile | 17 +++++++++++++++++ .../iso_3166-1_list_en.xml | 0 .../serviceproviders.xml | 0 .../openvpn/client-export/template/7zS.sfx | Bin .../client-export/template/config-import | 0 .../client-export/template/config-standard | 0 .../openvpn-install-2.3.6-I001-i686.exe | Bin .../openvpn-install-2.3.6-I001-x86_64.exe | Bin .../openvpn-install-2.3.6-I601-i686.exe | Bin .../openvpn-install-2.3.6-I601-x86_64.exe | Bin .../template/openvpn-postinstall.exe | Bin .../template/openvpn-postinstall64.exe | Bin .../template/openvpnmanager/OpenVPN.dll | Bin .../template/openvpnmanager/OpenVPN.pdb | Bin .../openvpnmanager/OpenVPNManager.application | 0 .../template/openvpnmanager/OpenVPNManager.exe | Bin .../openvpnmanager/OpenVPNManager.exe.config | 0 .../openvpnmanager/OpenVPNManager.exe.manifest | 0 .../template/openvpnmanager/OpenVPNManager.pdb | Bin .../de/OpenVPNManager.resources.dll | Bin .../template/openvpnmanager/license.txt | 0 .../openvpnmanager/openvpn-postinstall.exe | Bin .../client-export/template/procchain-import | 0 .../client-export/template/procchain-standard | 0 .../client-export/template/procchain.exe | Bin 26 files changed, 19 insertions(+) create mode 100644 contrib/Makefile rename {src/share => contrib}/mobile-broadband-provider-info/iso_3166-1_list_en.xml (100%) rename {src/share => contrib}/mobile-broadband-provider-info/serviceproviders.xml (100%) rename {src/share => contrib}/openvpn/client-export/template/7zS.sfx (100%) rename {src/share => contrib}/openvpn/client-export/template/config-import (100%) rename {src/share => contrib}/openvpn/client-export/template/config-standard (100%) rename {src/share => contrib}/openvpn/client-export/template/openvpn-install-2.3.6-I001-i686.exe (100%) rename {src/share => contrib}/openvpn/client-export/template/openvpn-install-2.3.6-I001-x86_64.exe (100%) rename {src/share => contrib}/openvpn/client-export/template/openvpn-install-2.3.6-I601-i686.exe (100%) rename {src/share => contrib}/openvpn/client-export/template/openvpn-install-2.3.6-I601-x86_64.exe (100%) rename {src/share => contrib}/openvpn/client-export/template/openvpn-postinstall.exe (100%) rename {src/share => contrib}/openvpn/client-export/template/openvpn-postinstall64.exe (100%) rename {src/share => contrib}/openvpn/client-export/template/openvpnmanager/OpenVPN.dll (100%) rename {src/share => contrib}/openvpn/client-export/template/openvpnmanager/OpenVPN.pdb (100%) rename {src/share => contrib}/openvpn/client-export/template/openvpnmanager/OpenVPNManager.application (100%) rename {src/share => contrib}/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe (100%) rename {src/share => contrib}/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe.config (100%) rename {src/share => contrib}/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe.manifest (100%) rename {src/share => contrib}/openvpn/client-export/template/openvpnmanager/OpenVPNManager.pdb (100%) rename {src/share => contrib}/openvpn/client-export/template/openvpnmanager/de/OpenVPNManager.resources.dll (100%) rename {src/share => contrib}/openvpn/client-export/template/openvpnmanager/license.txt (100%) rename {src/share => contrib}/openvpn/client-export/template/openvpnmanager/openvpn-postinstall.exe (100%) rename {src/share => contrib}/openvpn/client-export/template/procchain-import (100%) rename {src/share => contrib}/openvpn/client-export/template/procchain-standard (100%) rename {src/share => contrib}/openvpn/client-export/template/procchain.exe (100%) diff --git a/Makefile b/Makefile index 641631f7e..4c69a498f 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,8 @@ install: force @make -C ${.CURDIR}/pkg install # invoke translation glue @make -C ${.CURDIR}/lang install + # invoke third-party tools + @make -C ${.CURDIR}/contrib install # finally pretty-print a list of files present @(cd ${.CURDIR}/src; find * -type f) | \ xargs -n1 printf "/usr/local/%s\n" diff --git a/contrib/Makefile b/contrib/Makefile new file mode 100644 index 000000000..57a5f3da6 --- /dev/null +++ b/contrib/Makefile @@ -0,0 +1,17 @@ +all: + +install: + # bootstrap needed root directories + @mkdir -p ${DESTDIR}/usr/local/share + # openvpn client exporter files + @cp -r ${.CURDIR}/openvpn ${DESTDIR}/usr/local/share/ + @(cd ${.CURDIR}/openvpn; find * -type f) | \ + xargs -n1 printf "/usr/local/share/openvpn/%s\n" + # mobile broadband provider database + @cp -r ${.CURDIR}/mobile-broadband-provider-info \ + ${DESTDIR}/usr/local/share/ + @(cd ${.CURDIR}/mobile-broadband-provider-info; find * -type f) | \ + xargs -n1 printf \ + "/usr/local/share/mobile-broadband-provider-info/%s\n" + +.PHONY: install diff --git a/src/share/mobile-broadband-provider-info/iso_3166-1_list_en.xml b/contrib/mobile-broadband-provider-info/iso_3166-1_list_en.xml similarity index 100% rename from src/share/mobile-broadband-provider-info/iso_3166-1_list_en.xml rename to contrib/mobile-broadband-provider-info/iso_3166-1_list_en.xml diff --git a/src/share/mobile-broadband-provider-info/serviceproviders.xml b/contrib/mobile-broadband-provider-info/serviceproviders.xml similarity index 100% rename from src/share/mobile-broadband-provider-info/serviceproviders.xml rename to contrib/mobile-broadband-provider-info/serviceproviders.xml diff --git a/src/share/openvpn/client-export/template/7zS.sfx b/contrib/openvpn/client-export/template/7zS.sfx similarity index 100% rename from src/share/openvpn/client-export/template/7zS.sfx rename to contrib/openvpn/client-export/template/7zS.sfx diff --git a/src/share/openvpn/client-export/template/config-import b/contrib/openvpn/client-export/template/config-import similarity index 100% rename from src/share/openvpn/client-export/template/config-import rename to contrib/openvpn/client-export/template/config-import diff --git a/src/share/openvpn/client-export/template/config-standard b/contrib/openvpn/client-export/template/config-standard similarity index 100% rename from src/share/openvpn/client-export/template/config-standard rename to contrib/openvpn/client-export/template/config-standard diff --git a/src/share/openvpn/client-export/template/openvpn-install-2.3.6-I001-i686.exe b/contrib/openvpn/client-export/template/openvpn-install-2.3.6-I001-i686.exe similarity index 100% rename from src/share/openvpn/client-export/template/openvpn-install-2.3.6-I001-i686.exe rename to contrib/openvpn/client-export/template/openvpn-install-2.3.6-I001-i686.exe diff --git a/src/share/openvpn/client-export/template/openvpn-install-2.3.6-I001-x86_64.exe b/contrib/openvpn/client-export/template/openvpn-install-2.3.6-I001-x86_64.exe similarity index 100% rename from src/share/openvpn/client-export/template/openvpn-install-2.3.6-I001-x86_64.exe rename to contrib/openvpn/client-export/template/openvpn-install-2.3.6-I001-x86_64.exe diff --git a/src/share/openvpn/client-export/template/openvpn-install-2.3.6-I601-i686.exe b/contrib/openvpn/client-export/template/openvpn-install-2.3.6-I601-i686.exe similarity index 100% rename from src/share/openvpn/client-export/template/openvpn-install-2.3.6-I601-i686.exe rename to contrib/openvpn/client-export/template/openvpn-install-2.3.6-I601-i686.exe diff --git a/src/share/openvpn/client-export/template/openvpn-install-2.3.6-I601-x86_64.exe b/contrib/openvpn/client-export/template/openvpn-install-2.3.6-I601-x86_64.exe similarity index 100% rename from src/share/openvpn/client-export/template/openvpn-install-2.3.6-I601-x86_64.exe rename to contrib/openvpn/client-export/template/openvpn-install-2.3.6-I601-x86_64.exe diff --git a/src/share/openvpn/client-export/template/openvpn-postinstall.exe b/contrib/openvpn/client-export/template/openvpn-postinstall.exe similarity index 100% rename from src/share/openvpn/client-export/template/openvpn-postinstall.exe rename to contrib/openvpn/client-export/template/openvpn-postinstall.exe diff --git a/src/share/openvpn/client-export/template/openvpn-postinstall64.exe b/contrib/openvpn/client-export/template/openvpn-postinstall64.exe similarity index 100% rename from src/share/openvpn/client-export/template/openvpn-postinstall64.exe rename to contrib/openvpn/client-export/template/openvpn-postinstall64.exe diff --git a/src/share/openvpn/client-export/template/openvpnmanager/OpenVPN.dll b/contrib/openvpn/client-export/template/openvpnmanager/OpenVPN.dll similarity index 100% rename from src/share/openvpn/client-export/template/openvpnmanager/OpenVPN.dll rename to contrib/openvpn/client-export/template/openvpnmanager/OpenVPN.dll diff --git a/src/share/openvpn/client-export/template/openvpnmanager/OpenVPN.pdb b/contrib/openvpn/client-export/template/openvpnmanager/OpenVPN.pdb similarity index 100% rename from src/share/openvpn/client-export/template/openvpnmanager/OpenVPN.pdb rename to contrib/openvpn/client-export/template/openvpnmanager/OpenVPN.pdb diff --git a/src/share/openvpn/client-export/template/openvpnmanager/OpenVPNManager.application b/contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.application similarity index 100% rename from src/share/openvpn/client-export/template/openvpnmanager/OpenVPNManager.application rename to contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.application diff --git a/src/share/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe b/contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe similarity index 100% rename from src/share/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe rename to contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe diff --git a/src/share/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe.config b/contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe.config similarity index 100% rename from src/share/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe.config rename to contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe.config diff --git a/src/share/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe.manifest b/contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe.manifest similarity index 100% rename from src/share/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe.manifest rename to contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe.manifest diff --git a/src/share/openvpn/client-export/template/openvpnmanager/OpenVPNManager.pdb b/contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.pdb similarity index 100% rename from src/share/openvpn/client-export/template/openvpnmanager/OpenVPNManager.pdb rename to contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.pdb diff --git a/src/share/openvpn/client-export/template/openvpnmanager/de/OpenVPNManager.resources.dll b/contrib/openvpn/client-export/template/openvpnmanager/de/OpenVPNManager.resources.dll similarity index 100% rename from src/share/openvpn/client-export/template/openvpnmanager/de/OpenVPNManager.resources.dll rename to contrib/openvpn/client-export/template/openvpnmanager/de/OpenVPNManager.resources.dll diff --git a/src/share/openvpn/client-export/template/openvpnmanager/license.txt b/contrib/openvpn/client-export/template/openvpnmanager/license.txt similarity index 100% rename from src/share/openvpn/client-export/template/openvpnmanager/license.txt rename to contrib/openvpn/client-export/template/openvpnmanager/license.txt diff --git a/src/share/openvpn/client-export/template/openvpnmanager/openvpn-postinstall.exe b/contrib/openvpn/client-export/template/openvpnmanager/openvpn-postinstall.exe similarity index 100% rename from src/share/openvpn/client-export/template/openvpnmanager/openvpn-postinstall.exe rename to contrib/openvpn/client-export/template/openvpnmanager/openvpn-postinstall.exe diff --git a/src/share/openvpn/client-export/template/procchain-import b/contrib/openvpn/client-export/template/procchain-import similarity index 100% rename from src/share/openvpn/client-export/template/procchain-import rename to contrib/openvpn/client-export/template/procchain-import diff --git a/src/share/openvpn/client-export/template/procchain-standard b/contrib/openvpn/client-export/template/procchain-standard similarity index 100% rename from src/share/openvpn/client-export/template/procchain-standard rename to contrib/openvpn/client-export/template/procchain-standard diff --git a/src/share/openvpn/client-export/template/procchain.exe b/contrib/openvpn/client-export/template/procchain.exe similarity index 100% rename from src/share/openvpn/client-export/template/procchain.exe rename to contrib/openvpn/client-export/template/procchain.exe