Change all CRLF linefeeds to LF linefeeds

Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
(cherry picked from commit 6b2883a637fe73492f09816ee95b00c1b88d5fcb)

1 files changed, 16 insertions, 16 deletions

diff --git a/win/make_dist.py b/win/make_dist.py
index 730ccb7..29eb2d2 100644
--- a/win/make_dist.py
+++ b/win/make_dist.py
@@ -3,14 +3,14 @@ from wb import home_fn, rm_rf, mkdir, cp_a, cp, rename, run_in_vs_shell
 
 def main(config, tap=True):
     dist = config['DIST']
-    assert dist

-    dist = home_fn(dist)

-    bin = os.path.join(dist, 'bin')

-    i386 = os.path.join(dist, 'i386')

-    amd64 = os.path.join(dist, 'amd64')

+    assert dist
+    dist = home_fn(dist)
+    bin = os.path.join(dist, 'bin')
+    i386 = os.path.join(dist, 'i386')
+    amd64 = os.path.join(dist, 'amd64')
     samples = os.path.join(dist, 'samples')
-

-    # build dist and subdirectories

+
+    # build dist and subdirectories
     rm_rf(dist)
     mkdir(dist)
     mkdir(bin)
@@ -19,19 +19,19 @@ def main(config, tap=True):
     mkdir(samples)
 
     # copy openvpn.exe, openvpnserv.exe and their manifests
-    cp(home_fn('openvpn.exe'), bin)

-    cp(home_fn('openvpn.exe.manifest'), bin)

+    cp(home_fn('openvpn.exe'), bin)
+    cp(home_fn('openvpn.exe.manifest'), bin)
     cp(home_fn('service-win32/openvpnserv.exe'), bin)
     cp(home_fn('service-win32/openvpnserv.exe.manifest'), bin)
 
     # copy openvpn-gui
     cp(home_fn(config['OPENVPN_GUI_DIR']+"/"+config['OPENVPN_GUI']), bin)
-

-    # copy DLL dependencies

-    cp(home_fn(config['LZO_DIR']+'/bin/lzo2.dll'), bin)

+
+    # copy DLL dependencies
+    cp(home_fn(config['LZO_DIR']+'/bin/lzo2.dll'), bin)
     cp(home_fn(config['LZO_DIR']+'/bin/lzo2.dll.manifest'), bin)
-    cp(home_fn(config['OPENSSL_DIR']+'/bin/libeay32.dll'), bin)

-    cp(home_fn(config['OPENSSL_DIR']+'/bin/ssleay32.dll'), bin)

+    cp(home_fn(config['OPENSSL_DIR']+'/bin/libeay32.dll'), bin)
+    cp(home_fn(config['OPENSSL_DIR']+'/bin/ssleay32.dll'), bin)
     cp(home_fn(config['PKCS11_HELPER_DIR']+'/lib/libpkcs11-helper-1.dll'), bin)
     cp(home_fn(config['PKCS11_HELPER_DIR']+'/lib/libpkcs11-helper-1.dll.manifest'), bin)
 
@@ -103,5 +103,5 @@ def main(config, tap=True):
 
 # if we are run directly, and not loaded as a module
 if __name__ == "__main__":
-    from wb import config

-    main(config)

+    from wb import config
+    main(config)