[Openvpn-devel] [PATCH 4/6] build: msvc: upgrade to Visual Studio 2010 + fixups

2012-03-24 Thread Alon Bar-Lev 
Signed-off-by: Alon Bar-Lev 
---
 .gitignore |2 +
 build/msvc/msvc-generate/Makefile.am   |2 +-
 build/msvc/msvc-generate/msvc-generate.vcproj  |   74 ---
 build/msvc/msvc-generate/msvc-generate.vcxproj |   69 +++
 msvc-build.bat |   27 +-
 msvc-dev.bat   |   19 +-
 msvc-env.bat   |7 +-
 openvpn.sln|   90 ++--
 src/compat/Makefile.am |3 +-
 src/compat/compat.vcproj   |  197 --
 src/compat/compat.vcxproj  |   87 +++
 src/compat/compat.vcxproj.filters  |   42 ++
 src/openvpn/Makefile.am|3 +-
 src/openvpn/openvpn.vcproj |  777 
 src/openvpn/openvpn.vcxproj|  261 
 src/openvpn/openvpn.vcxproj.filters|  458 ++
 src/openvpnserv/Makefile.am|3 +-
 src/openvpnserv/openvpnserv.vcproj |  209 ---
 src/openvpnserv/openvpnserv.vcxproj|  112 
 src/openvpnserv/openvpnserv.vcxproj.filters|   35 ++
 20 files changed, 1153 insertions(+), 1324 deletions(-)
 delete mode 100644 build/msvc/msvc-generate/msvc-generate.vcproj
 create mode 100644 build/msvc/msvc-generate/msvc-generate.vcxproj
 delete mode 100644 src/compat/compat.vcproj
 create mode 100644 src/compat/compat.vcxproj
 create mode 100644 src/compat/compat.vcxproj.filters
 delete mode 100644 src/openvpn/openvpn.vcproj
 create mode 100644 src/openvpn/openvpn.vcxproj
 create mode 100644 src/openvpn/openvpn.vcxproj.filters
 delete mode 100644 src/openvpnserv/openvpnserv.vcproj
 create mode 100644 src/openvpnserv/openvpnserv.vcxproj
 create mode 100644 src/openvpnserv/openvpnserv.vcxproj.filters

diff --git a/.gitignore b/.gitignore
index 2f72ed8..60b9433 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,8 @@
 *.suo
 *.ncb
 *.vcproj.*
+*.vcxproj.user
+*.sln.cache
 *.log
 Release
 Debug
diff --git a/build/msvc/msvc-generate/Makefile.am 
b/build/msvc/msvc-generate/Makefile.am
index 035ae22..539fb6c 100644
--- a/build/msvc/msvc-generate/Makefile.am
+++ b/build/msvc/msvc-generate/Makefile.am
@@ -13,6 +13,6 @@ MAINTAINERCLEANFILES = \
$(srcdir)/Makefile.in

 dist_noinst_DATA = \
-   msvc-generate.vcproj \
+   msvc-generate.vcxproj \
Makefile.mak \
msvc-generate.js
diff --git a/build/msvc/msvc-generate/msvc-generate.vcproj 
b/build/msvc/msvc-generate/msvc-generate.vcproj
deleted file mode 100644
index 3b7dc18..000
--- a/build/msvc/msvc-generate/msvc-generate.vcproj
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-
diff --git a/build/msvc/msvc-generate/msvc-generate.vcxproj 
b/build/msvc/msvc-generate/msvc-generate.vcxproj
new file mode 100644
index 000..e6491ab
--- /dev/null
+++ b/build/msvc/msvc-generate/msvc-generate.vcxproj
@@ -0,0 +1,69 @@
+
+http://schemas.microsoft.com/developer/msbuild/2003";>
+  
+
+  Debug
+  Win32
+
+
+  Release
+  Win32
+
+  
+  
+{8598C2C8-34C4-47A1-99B0-7C295A890615}
+msvc-generate
+MakeFileProj
+  
+  
+  
+Makefile
+  
+  
+Makefile
+  
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+<_ProjectFileVersion>10.0.30319.1
+$(Configuration)\
+$(Configuration)\
+nmake -f Makefile.mak 
all
+nmake -f Makefile.mak 
clean all
+nmake -f Makefile.mak 
clean
+config-msvc-version.h
+WIN32;_DEBUG;$(NMakePreprocessorDefinitions)
+$(NMakeIncludeSearchPath)
+$(NMakeForcedIncludes)
+$(NMakeAssemblySearchPath)
+$(NMakeForcedUsingAssemblies)
+$(Configuration)\
+$(Configuration)\
+nmake -f 
Makefile.mak all
+nmake -f 
Makefile.mak clean all
+nmake -f 
Makefile.mak clean
+config-msvc-version.h
+WIN32;NDEBUG;$(NMakePreprocessorDefinitions)
+$(NMakeIncludeSearchPath)
+$(NMakeForcedIncludes)
+$(NMakeAssemblySearchPath)
+$(NMakeForcedUsingAssemblies)
+  
+  
+  
+  
+
+
+  
+  
+  
+  
+
\ No newline at end of file
diff --git a/msvc-build.bat b/msvc-build.bat
index 02a396c..01417d1 100644
--- a/msvc-build.bat
+++ b/msvc-build.bat
@@ -1,23 +1,37 @@
 @echo off
-
 rem Copyright (C) 2008-2012 Alon Bar-Lev 

-call msvc-env.bat
-
 @rem this stupid command needed for SetEnv.cmd to operate
 setlocal ENABLEDELAYEDEXPANSION

+call msvc-env.bat
+
 set PLATFORMS=Win32
 set CONFIGURATIONS=Release

-call "%VCHOME%\bin\vcvars32.bat"
+if exist "%VCHOME%\vcvarsall.bat" (
+   call "%VCHOME%\vcvarsall.bat"
+) else if exist "%VCHOME%\bin\vcvars32.bat" (
+

Re: [Openvpn-devel] [PATCH 4/6] build: msvc: upgrade to Visual Studio 2010 + fixups

2012-03-28 Thread Alon Bar-Lev 
On Sat, Mar 24, 2012 at 9:58 AM, Alon Bar-Lev  wrote:
>
> Signed-off-by: Alon Bar-Lev 
> ---
>  .gitignore                                     |    2 +
>  build/msvc/msvc-generate/Makefile.am           |    2 +-
>  build/msvc/msvc-generate/msvc-generate.vcproj  |   74 ---
>  build/msvc/msvc-generate/msvc-generate.vcxproj |   69 +++
>  msvc-build.bat                                 |   27 +-
>  msvc-dev.bat                                   |   19 +-
>  msvc-env.bat                                   |    7 +-
>  openvpn.sln                                    |   90 ++--
>  src/compat/Makefile.am                         |    3 +-
>  src/compat/compat.vcproj                       |  197 --
>  src/compat/compat.vcxproj                      |   87 +++
>  src/compat/compat.vcxproj.filters              |   42 ++
>  src/openvpn/Makefile.am                        |    3 +-
>  src/openvpn/openvpn.vcproj                     |  777
> 
>  src/openvpn/openvpn.vcxproj                    |  261 
>  src/openvpn/openvpn.vcxproj.filters            |  458 ++
>  src/openvpnserv/Makefile.am                    |    3 +-
>  src/openvpnserv/openvpnserv.vcproj             |  209 ---
>  src/openvpnserv/openvpnserv.vcxproj            |  112 
>  src/openvpnserv/openvpnserv.vcxproj.filters    |   35 ++
>  20 files changed, 1153 insertions(+), 1324 deletions(-)
>  delete mode 100644 build/msvc/msvc-generate/msvc-generate.vcproj
>  create mode 100644 build/msvc/msvc-generate/msvc-generate.vcxproj
>  delete mode 100644 src/compat/compat.vcproj
>  create mode 100644 src/compat/compat.vcxproj
>  create mode 100644 src/compat/compat.vcxproj.filters
>  delete mode 100644 src/openvpn/openvpn.vcproj
>  create mode 100644 src/openvpn/openvpn.vcxproj
>  create mode 100644 src/openvpn/openvpn.vcxproj.filters
>  delete mode 100644 src/openvpnserv/openvpnserv.vcproj
>  create mode 100644 src/openvpnserv/openvpnserv.vcxproj
>  create mode 100644 src/openvpnserv/openvpnserv.vcxproj.filters


David,
What with this one?
No point in supporting visual studio 2008 at 2012

Alon.

Re: [Openvpn-devel] [PATCH 4/6] build: msvc: upgrade to Visual Studio 2010 + fixups

2012-03-28 Thread David Sommerseth 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 28/03/12 17:07, Alon Bar-Lev wrote:
> On Sat, Mar 24, 2012 at 9:58 AM, Alon Bar-Lev 
> wrote:
>> 
>> Signed-off-by: Alon Bar-Lev  --- .gitignore
>> |2 + build/msvc/msvc-generate/Makefile.am   |2 +- 
>> build/msvc/msvc-generate/msvc-generate.vcproj  |   74 --- 
>> build/msvc/msvc-generate/msvc-generate.vcxproj |   69 +++ 
>> msvc-build.bat |   27 +- 
>> msvc-dev.bat   |   19 +- 
>> msvc-env.bat   |7 +- openvpn.sln
>> |   90 ++-- src/compat/Makefile.am |3
>> +- src/compat/compat.vcproj   |  197 -- 
>> src/compat/compat.vcxproj  |   87 +++ 
>> src/compat/compat.vcxproj.filters  |   42 ++ 
>> src/openvpn/Makefile.am|3 +- 
>> src/openvpn/openvpn.vcproj |  777 
>>  src/openvpn/openvpn.vcxproj
>> |  261  src/openvpn/openvpn.vcxproj.filters|
>> 458 ++ src/openvpnserv/Makefile.am|
>> 3 +- src/openvpnserv/openvpnserv.vcproj |  209 --- 
>> src/openvpnserv/openvpnserv.vcxproj|  112  
>> src/openvpnserv/openvpnserv.vcxproj.filters|   35 ++ 20 files
>> changed, 1153 insertions(+), 1324 deletions(-) delete mode 100644
>> build/msvc/msvc-generate/msvc-generate.vcproj create mode 100644
>> build/msvc/msvc-generate/msvc-generate.vcxproj delete mode 100644
>> src/compat/compat.vcproj create mode 100644
>> src/compat/compat.vcxproj create mode 100644
>> src/compat/compat.vcxproj.filters delete mode 100644
>> src/openvpn/openvpn.vcproj create mode 100644
>> src/openvpn/openvpn.vcxproj create mode 100644
>> src/openvpn/openvpn.vcxproj.filters delete mode 100644
>> src/openvpnserv/openvpnserv.vcproj create mode 100644
>> src/openvpnserv/openvpnserv.vcxproj create mode 100644
>> src/openvpnserv/openvpnserv.vcxproj.filters
> 
> 
> David, What with this one? No point in supporting visual studio 2008
> at 2012

I don't have access to Visual Studio environments, so I'd rather see
someone else ack this patch.  But unless it doesn't get any NACKs within
the next week, I'll pull it using the lazy-consensus
approach.


kind regards,

David Sommerseth
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk9zSrIACgkQDC186MBRfrrAjQCgkUjV2GUgso6PZPZMDaY3N0rl
ONcAnixWsChRoFOjW/qkXpu1pnnQ2y2p
=FdA0
-END PGP SIGNATURE-

Re: [Openvpn-devel] [PATCH 4/6] build: msvc: upgrade to Visual Studio 2010 + fixups

2012-03-29 Thread Samuli Seppänen 
Hi,

This looks ok, provided we don't need Visual Studio for official
releases anymore (signing the installer, openvpn.exe and tap-driver).
The version I had to use for 2.3-alpha1 and earlier was VS2008. I doubt
James minds either, as he's still using his old Python build system.
When he's ready to move on, the upgrade license costs around $500[1] -
provided that he even wants/needs to build with Visual Studio at that point.

ACK.

Samuli

[1]



> Signed-off-by: Alon Bar-Lev 
> ---
>  .gitignore |2 +
>  build/msvc/msvc-generate/Makefile.am   |2 +-
>  build/msvc/msvc-generate/msvc-generate.vcproj  |   74 ---
>  build/msvc/msvc-generate/msvc-generate.vcxproj |   69 +++
>  msvc-build.bat |   27 +-
>  msvc-dev.bat   |   19 +-
>  msvc-env.bat   |7 +-
>  openvpn.sln|   90 ++--
>  src/compat/Makefile.am |3 +-
>  src/compat/compat.vcproj   |  197 --
>  src/compat/compat.vcxproj  |   87 +++
>  src/compat/compat.vcxproj.filters  |   42 ++
>  src/openvpn/Makefile.am|3 +-
>  src/openvpn/openvpn.vcproj |  777 
> 
>  src/openvpn/openvpn.vcxproj|  261 
>  src/openvpn/openvpn.vcxproj.filters|  458 ++
>  src/openvpnserv/Makefile.am|3 +-
>  src/openvpnserv/openvpnserv.vcproj |  209 ---
>  src/openvpnserv/openvpnserv.vcxproj|  112 
>  src/openvpnserv/openvpnserv.vcxproj.filters|   35 ++
>  20 files changed, 1153 insertions(+), 1324 deletions(-)
>  delete mode 100644 build/msvc/msvc-generate/msvc-generate.vcproj
>  create mode 100644 build/msvc/msvc-generate/msvc-generate.vcxproj
>  delete mode 100644 src/compat/compat.vcproj
>  create mode 100644 src/compat/compat.vcxproj
>  create mode 100644 src/compat/compat.vcxproj.filters
>  delete mode 100644 src/openvpn/openvpn.vcproj
>  create mode 100644 src/openvpn/openvpn.vcxproj
>  create mode 100644 src/openvpn/openvpn.vcxproj.filters
>  delete mode 100644 src/openvpnserv/openvpnserv.vcproj
>  create mode 100644 src/openvpnserv/openvpnserv.vcxproj
>  create mode 100644 src/openvpnserv/openvpnserv.vcxproj.filters
>
> diff --git a/.gitignore b/.gitignore
> index 2f72ed8..60b9433 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -10,6 +10,8 @@
>  *.suo
>  *.ncb
>  *.vcproj.*
> +*.vcxproj.user
> +*.sln.cache
>  *.log
>  Release
>  Debug
> diff --git a/build/msvc/msvc-generate/Makefile.am 
> b/build/msvc/msvc-generate/Makefile.am
> index 035ae22..539fb6c 100644
> --- a/build/msvc/msvc-generate/Makefile.am
> +++ b/build/msvc/msvc-generate/Makefile.am
> @@ -13,6 +13,6 @@ MAINTAINERCLEANFILES = \
> $(srcdir)/Makefile.in
>
>  dist_noinst_DATA = \
> -   msvc-generate.vcproj \
> +   msvc-generate.vcxproj \
> Makefile.mak \
> msvc-generate.js
> diff --git a/build/msvc/msvc-generate/msvc-generate.vcproj 
> b/build/msvc/msvc-generate/msvc-generate.vcproj
> deleted file mode 100644
> index 3b7dc18..000
> --- a/build/msvc/msvc-generate/msvc-generate.vcproj
> +++ /dev/null
> @@ -1,74 +0,0 @@
> -
> - -   ProjectType="Visual C++"
> -   Version="9.00"
> -   Name="msvc-generate"
> -   ProjectGUID="{8598C2C8-34C4-47A1-99B0-7C295A890615}"
> -   RootNamespace="msvc-generate"
> -   Keyword="MakeFileProj"
> -   TargetFrameworkVersion="196613"
> -   >
> -   
> --   Name="Win32"
> -   />
> -   
> -   
> -   
> -   
> --   Name="Debug|Win32"
> -   OutputDirectory="$(ConfigurationName)"
> -   IntermediateDirectory="$(ConfigurationName)"
> -   ConfigurationType="0"
> -   >
> --   Name="VCNMakeTool"
> -   BuildCommandLine="nmake -f Makefile.mak all"
> -   ReBuildCommandLine="nmake -f Makefile.mak 
> clean all"
> -   CleanCommandLine="nmake -f Makefile.mak clean"
> -   Output="config-msvc-version.h"
> -   PreprocessorDefinitions="WIN32;_DEBUG"
> -   IncludeSearchPath=""
> -   ForcedIncludes=""
> -   AssemblySearchPath=""
> -   ForcedUsingAssemblies=""
> -   CompileAsManaged=""
> -   />
> -   
> --   Nam

Re: [Openvpn-devel] [PATCH 4/6] build: msvc: upgrade to Visual Studio 2010 + fixups

2012-03-29 Thread Alon Bar-Lev 
2012/3/29 Samuli Seppänen :
> When he's ready to move on, the upgrade license costs around $500[1] -
> provided that he even wants/needs to build with Visual Studio at that point.

You do not need to pay anything, the Visual Studio 2010 express is for
free as much as I know.

Alon.

Re: [Openvpn-devel] [PATCH 4/6] build: msvc: upgrade to Visual Studio 2010 + fixups

2012-03-29 Thread David Sommerseth 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 24/03/12 08:58, Alon Bar-Lev wrote:
> Signed-off-by: Alon Bar-Lev  --- .gitignore
> |2 + build/msvc/msvc-generate/Makefile.am   |2 +- 
> build/msvc/msvc-generate/msvc-generate.vcproj  |   74 --- 
> build/msvc/msvc-generate/msvc-generate.vcxproj |   69 +++ 
> msvc-build.bat |   27 +- msvc-dev.bat
> |   19 +- msvc-env.bat   |7 +- 
> openvpn.sln|   90 ++-- 
> src/compat/Makefile.am |3 +- 
> src/compat/compat.vcproj   |  197 -- 
> src/compat/compat.vcxproj  |   87 +++ 
> src/compat/compat.vcxproj.filters  |   42 ++ 
> src/openvpn/Makefile.am|3 +- 
> src/openvpn/openvpn.vcproj |  777
>  src/openvpn/openvpn.vcxproj
> |  261  src/openvpn/openvpn.vcxproj.filters|  458
> ++ src/openvpnserv/Makefile.am|3
> +- src/openvpnserv/openvpnserv.vcproj |  209 --- 
> src/openvpnserv/openvpnserv.vcxproj|  112  
> src/openvpnserv/openvpnserv.vcxproj.filters|   35 ++ 20 files
> changed, 1153 insertions(+), 1324 deletions(-) delete mode 100644
> build/msvc/msvc-generate/msvc-generate.vcproj create mode 100644
> build/msvc/msvc-generate/msvc-generate.vcxproj delete mode 100644
> src/compat/compat.vcproj create mode 100644 src/compat/compat.vcxproj 
> create mode 100644 src/compat/compat.vcxproj.filters delete mode
> 100644 src/openvpn/openvpn.vcproj create mode 100644
> src/openvpn/openvpn.vcxproj create mode 100644
> src/openvpn/openvpn.vcxproj.filters delete mode 100644
> src/openvpnserv/openvpnserv.vcproj create mode 100644
> src/openvpnserv/openvpnserv.vcxproj create mode 100644
> src/openvpnserv/openvpnserv.vcxproj.filters

Applied to master branches on -testing and -stable trees.


commit 3c1971de878bb3658c38b0504f314d38b6b765d2
Author: Alon Bar-Lev 
List-Post: openvpn-devel@lists.sourceforge.net
Date:   Sat Mar 24 09:58:36 2012 +0200

Signed-off-by: Alon Bar-Lev 
Acked-by: Samuli Seppänen 
Signed-off-by: David Sommerseth 


kind regards,

David Sommerseth
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk90PW0ACgkQDC186MBRfroUVwCeLLO68J69XstVm9+0pm+I0PVc
zysAnAgYqMa+Jp6UFQGa1H+vGQj98pxQ
=ZYPY
-END PGP SIGNATURE-

Re: [Openvpn-devel] [PATCH 4/6] build: msvc: upgrade to Visual Studio 2010 + fixups

2012-03-29 Thread Alon Bar-Lev 
This is not good.
Another issue of this MIME magic that should be avoided.
VC files are CRLF, if we do not commit them this way, every time they
change we see a complete rewrite.

If you do not want to pull, please do:

find . -name '*.sln' -or -name '*.vcxproj.*' | xargs unix2dos

And commit.

On Thu, Mar 29, 2012 at 12:46 PM, David Sommerseth
 wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA1
>
> On 24/03/12 08:58, Alon Bar-Lev wrote:
>> Signed-off-by: Alon Bar-Lev  --- .gitignore
>> |    2 + build/msvc/msvc-generate/Makefile.am           |    2 +-
>> build/msvc/msvc-generate/msvc-generate.vcproj  |   74 ---
>> build/msvc/msvc-generate/msvc-generate.vcxproj |   69 +++
>> msvc-build.bat                                 |   27 +- msvc-dev.bat
>> |   19 +- msvc-env.bat                                   |    7 +-
>> openvpn.sln                                    |   90 ++--
>> src/compat/Makefile.am                         |    3 +-
>> src/compat/compat.vcproj                       |  197 --
>> src/compat/compat.vcxproj                      |   87 +++
>> src/compat/compat.vcxproj.filters              |   42 ++
>> src/openvpn/Makefile.am                        |    3 +-
>> src/openvpn/openvpn.vcproj                     |  777
>>  src/openvpn/openvpn.vcxproj
>> |  261  src/openvpn/openvpn.vcxproj.filters            |  458
>> ++ src/openvpnserv/Makefile.am                    |    3
>> +- src/openvpnserv/openvpnserv.vcproj             |  209 ---
>> src/openvpnserv/openvpnserv.vcxproj            |  112 
>> src/openvpnserv/openvpnserv.vcxproj.filters    |   35 ++ 20 files
>> changed, 1153 insertions(+), 1324 deletions(-) delete mode 100644
>> build/msvc/msvc-generate/msvc-generate.vcproj create mode 100644
>> build/msvc/msvc-generate/msvc-generate.vcxproj delete mode 100644
>> src/compat/compat.vcproj create mode 100644 src/compat/compat.vcxproj
>> create mode 100644 src/compat/compat.vcxproj.filters delete mode
>> 100644 src/openvpn/openvpn.vcproj create mode 100644
>> src/openvpn/openvpn.vcxproj create mode 100644
>> src/openvpn/openvpn.vcxproj.filters delete mode 100644
>> src/openvpnserv/openvpnserv.vcproj create mode 100644
>> src/openvpnserv/openvpnserv.vcxproj create mode 100644
>> src/openvpnserv/openvpnserv.vcxproj.filters
>
> Applied to master branches on -testing and -stable trees.
>
>
> commit 3c1971de878bb3658c38b0504f314d38b6b765d2
> Author: Alon Bar-Lev 
> Date:   Sat Mar 24 09:58:36 2012 +0200
>
>    Signed-off-by: Alon Bar-Lev 
>    Acked-by: Samuli Seppänen 
>    Signed-off-by: David Sommerseth 
>
>
> kind regards,
>
> David Sommerseth
> -BEGIN PGP SIGNATURE-
> Version: GnuPG v1.4.11 (GNU/Linux)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
>
> iEYEARECAAYFAk90PW0ACgkQDC186MBRfroUVwCeLLO68J69XstVm9+0pm+I0PVc
> zysAnAgYqMa+Jp6UFQGa1H+vGQj98pxQ
> =ZYPY
> -END PGP SIGNATURE-
>
> --
> This SF email is sponsosred by:
> Try Windows Azure free for 90 days Click Here
> http://p.sf.net/sfu/sfd2d-msazure
> ___
> Openvpn-devel mailing list
> Openvpn-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/openvpn-devel

Re: [Openvpn-devel] [PATCH 4/6] build: msvc: upgrade to Visual Studio 2010 + fixups

2012-03-29 Thread David Sommerseth 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 29/03/12 14:51, Alon Bar-Lev wrote:
> This is not good. Another issue of this MIME magic that should be
> avoided. VC files are CRLF, if we do not commit them this way,
> every time they change we see a complete rewrite.
> 
> If you do not want to pull, please do:
> 
> find . -name '*.sln' -or -name '*.vcxproj.*' | xargs unix2dos
> 
> And commit.

We had quite some clean-up rounds on CR/LF issues quite a while ago.
After a lot of testing and searching the net, we found out that
keeping the git tree NL only would be an advantage.  And CR/LF issues
would be avoided when setting 'git config --global core.autocrlf true'
on Windows boxes.  This makes git add CR/LF when checking out files
from the repo automatically, and it will be stripped out when
committing files.

It's also described here:


Can you please double check if this works for you?  Then we don't have
to bother with the CR/LF issues at all, as it's mostly automatic.


kind regards,

David Sommerseth



> On Thu, Mar 29, 2012 at 12:46 PM, David Sommerseth 
>  wrote: On 24/03/12 08:58, Alon
> Bar-Lev wrote:
 Signed-off-by: Alon Bar-Lev  ---
 .gitignore |2 + build/msvc/msvc-generate/Makefile.am
 |2 +- build/msvc/msvc-generate/msvc-generate.vcproj  |
 74 --- build/msvc/msvc-generate/msvc-generate.vcxproj |   69
 +++ msvc-build.bat |   27 +-
 msvc-dev.bat |   19 +- msvc-env.bat
 |7 +- openvpn.sln|
 90 ++-- src/compat/Makefile.am |3
 +- src/compat/compat.vcproj   |  197
 -- src/compat/compat.vcxproj  |   87
 +++ src/compat/compat.vcxproj.filters  |   42 ++ 
 src/openvpn/Makefile.am|3 +- 
 src/openvpn/openvpn.vcproj |  777 
  src/openvpn/openvpn.vcxproj |  261
  src/openvpn/openvpn.vcxproj.filters|
 458 ++ src/openvpnserv/Makefile.am
 |3 +- src/openvpnserv/openvpnserv.vcproj |
 209 --- src/openvpnserv/openvpnserv.vcxproj|
 112  src/openvpnserv/openvpnserv.vcxproj.filters|
 35 ++ 20 files changed, 1153 insertions(+), 1324 deletions(-)
 delete mode 100644 
 build/msvc/msvc-generate/msvc-generate.vcproj create mode
 100644 build/msvc/msvc-generate/msvc-generate.vcxproj delete
 mode 100644 src/compat/compat.vcproj create mode 100644
 src/compat/compat.vcxproj create mode 100644
 src/compat/compat.vcxproj.filters delete mode 100644
 src/openvpn/openvpn.vcproj create mode 100644 
 src/openvpn/openvpn.vcxproj create mode 100644 
 src/openvpn/openvpn.vcxproj.filters delete mode 100644 
 src/openvpnserv/openvpnserv.vcproj create mode 100644 
 src/openvpnserv/openvpnserv.vcxproj create mode 100644 
 src/openvpnserv/openvpnserv.vcxproj.filters
> 
> Applied to master branches on -testing and -stable trees.
> 
> 
> commit 3c1971de878bb3658c38b0504f314d38b6b765d2 Author: Alon
> Bar-Lev  Date:   Sat Mar 24 09:58:36 2012
> +0200
> 
> Signed-off-by: Alon Bar-Lev  Acked-by:
> Samuli Seppänen  Signed-off-by: David
> Sommerseth 
> 
> 
> kind regards,
> 
> David Sommerseth
>> 
>> --
>>
>> 
This SF email is sponsosred by:
>> Try Windows Azure free for 90 days Click Here 
>> http://p.sf.net/sfu/sfd2d-msazure 
>> ___ Openvpn-devel
>> mailing list Openvpn-devel@lists.sourceforge.net 
>> https://lists.sourceforge.net/lists/listinfo/openvpn-devel
> 

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk90XOQACgkQDC186MBRfrriugCaA58VFgV1k15ebL/h0Uk4FExx
u4MAnRL5oNuoLPym6qH3Jc/Rzf28ZcJP
=O/kG
-END PGP SIGNATURE-

Re: [Openvpn-devel] [PATCH 4/6] build: msvc: upgrade to Visual Studio 2010 + fixups

2012-03-29 Thread Alon Bar-Lev 
On Thu, Mar 29, 2012 at 3:00 PM, David Sommerseth
 wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA1
>
> On 29/03/12 14:51, Alon Bar-Lev wrote:
>> This is not good. Another issue of this MIME magic that should be
>> avoided. VC files are CRLF, if we do not commit them this way,
>> every time they change we see a complete rewrite.
>>
>> If you do not want to pull, please do:
>>
>> find . -name '*.sln' -or -name '*.vcxproj.*' | xargs unix2dos
>>
>> And commit.
>
> We had quite some clean-up rounds on CR/LF issues quite a while ago.
> After a lot of testing and searching the net, we found out that
> keeping the git tree NL only would be an advantage.  And CR/LF issues
> would be avoided when setting 'git config --global core.autocrlf true'
> on Windows boxes.  This makes git add CR/LF when checking out files
> from the repo automatically, and it will be stripped out when
> committing files.
>
> It's also described here:
> 
>
> Can you please double check if this works for you?  Then we don't have
> to bother with the CR/LF issues at all, as it's mostly automatic.

No, this is no good.

First global configuration of repository is wrong, as people tend to
have different global configurations.

Second, I don't trust the automatic detection of text files.

Third, there are files that must be CRLF no mater if I check it on
cygwin, or Linux and use samba share to access the files I still need
a valid configuration.

I suggest to remove this global setting and use local setting by
suffix, something like:

.gitattributes
---
*.c eol=lf
*.h eol=lf
*.vc*proj* eol=crlf
*.sln eol=crlf
---

Alon.

Re: [Openvpn-devel] [PATCH 4/6] build: msvc: upgrade to Visual Studio 2010 + fixups

2012-03-29 Thread David Sommerseth 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 29/03/12 15:12, Alon Bar-Lev wrote:
> On Thu, Mar 29, 2012 at 3:00 PM, David Sommerseth 
>  wrote:
>> -BEGIN PGP SIGNED MESSAGE- Hash: SHA1
>> 
>> On 29/03/12 14:51, Alon Bar-Lev wrote:
>>> This is not good. Another issue of this MIME magic that should
>>> be avoided. VC files are CRLF, if we do not commit them this
>>> way, every time they change we see a complete rewrite.
>>> 
>>> If you do not want to pull, please do:
>>> 
>>> find . -name '*.sln' -or -name '*.vcxproj.*' | xargs unix2dos
>>> 
>>> And commit.
>> 
>> We had quite some clean-up rounds on CR/LF issues quite a while
>> ago. After a lot of testing and searching the net, we found out
>> that keeping the git tree NL only would be an advantage.  And
>> CR/LF issues would be avoided when setting 'git config --global
>> core.autocrlf true' on Windows boxes.  This makes git add CR/LF
>> when checking out files from the repo automatically, and it will
>> be stripped out when committing files.
>> 
>> It's also described here: 
>> 
>>
>>
>> 
Can you please double check if this works for you?  Then we don't have
>> to bother with the CR/LF issues at all, as it's mostly
>> automatic.
> 
> No, this is no good.
> 
> First global configuration of repository is wrong, as people tend
> to have different global configurations.

By all means, remove the --global argument.  That was an example taken
from the git crash course, which is aimed at non-experienced people;
But I'm sorry I didn't remove the --global part in the reply, that
slipped my mind before sending it.  I'm sure you understand the impact
of --global far better than first time users, but lets not argue about
such nit-picking.

> Second, I don't trust the automatic detection of text files.

So far we have had no problems with git in this regards.  And as far
as I can see, the only non-text file have in the git tree now is
sample/sample-keys/pkcs12.p12.

We also found many places on the net suggesting this approach as
sensible and recommended approach.

> Third, there are files that must be CRLF no mater if I check it on 
> cygwin, or Linux and use samba share to access the files I still
> need a valid configuration.

We have not had any complaints about these issues so far, and we did
change all files to NL about a year ago.

Until there is a real issue among more git users and/or networked file
systems and cross-platform developers, then I'm willing to look at
this.  Regarding cygwin, we did also run some tests there too before
doing our switch, and at that point we didn't hit an issue either.

Lets rather fix real problems.


kind regards,

David Sommerseth
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk90bC8ACgkQDC186MBRfroFTgCdHZQL+HsEflz1tBwhl0ioa4wF
rkgAoJjE707kh5vtKKhWtTtaWEIqJjLr
=caUc
-END PGP SIGNATURE-

Re: [Openvpn-devel] [PATCH 4/6] build: msvc: upgrade to Visual Studio 2010 + fixups

2012-03-29 Thread Alon Bar-Lev 
On Thu, Mar 29, 2012 at 4:05 PM, David Sommerseth
 wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA1
>
> On 29/03/12 15:12, Alon Bar-Lev wrote:
>> On Thu, Mar 29, 2012 at 3:00 PM, David Sommerseth
>>  wrote:
>>> -BEGIN PGP SIGNED MESSAGE- Hash: SHA1
>>>
>>> On 29/03/12 14:51, Alon Bar-Lev wrote:
 This is not good. Another issue of this MIME magic that should
 be avoided. VC files are CRLF, if we do not commit them this
 way, every time they change we see a complete rewrite.

 If you do not want to pull, please do:

 find . -name '*.sln' -or -name '*.vcxproj.*' | xargs unix2dos

 And commit.
>>>
>>> We had quite some clean-up rounds on CR/LF issues quite a while
>>> ago. After a lot of testing and searching the net, we found out
>>> that keeping the git tree NL only would be an advantage.  And
>>> CR/LF issues would be avoided when setting 'git config --global
>>> core.autocrlf true' on Windows boxes.  This makes git add CR/LF
>>> when checking out files from the repo automatically, and it will
>>> be stripped out when committing files.
>>>
>>> It's also described here:
>>> 
>>>
>>>
>>>
> Can you please double check if this works for you?  Then we don't have
>>> to bother with the CR/LF issues at all, as it's mostly
>>> automatic.
>>
>> No, this is no good.
>>
>> First global configuration of repository is wrong, as people tend
>> to have different global configurations.
>
> By all means, remove the --global argument.  That was an example taken
> from the git crash course, which is aimed at non-experienced people;
> But I'm sorry I didn't remove the --global part in the reply, that
> slipped my mind before sending it.  I'm sure you understand the impact
> of --global far better than first time users, but lets not argue about
> such nit-picking.
>
>> Second, I don't trust the automatic detection of text files.
>
> So far we have had no problems with git in this regards.  And as far
> as I can see, the only non-text file have in the git tree now is
> sample/sample-keys/pkcs12.p12.
>
> We also found many places on the net suggesting this approach as
> sensible and recommended approach.
>
>> Third, there are files that must be CRLF no mater if I check it on
>> cygwin, or Linux and use samba share to access the files I still
>> need a valid configuration.
>
> We have not had any complaints about these issues so far, and we did
> change all files to NL about a year ago.

Because up until now you did not have a problem like these microsoft
specific files.

> Until there is a real issue among more git users and/or networked file
> systems and cross-platform developers, then I'm willing to look at
> this.  Regarding cygwin, we did also run some tests there too before
> doing our switch, and at that point we didn't hit an issue either.
>
> Lets rather fix real problems.

I am asking to fix real problem!
Believe me that as much as I hate specific configurations, this is required.
For people who use git and for those who are not.

For example...

at your end:
---
./configure
make
make dist
---

at other people end:
---
tar -xf 
cp -a openvpn* openvpn*.org
cd openvpn*
msvc-dev



cd ..
diff -urNp openvp* openvpn*.org
---

will result in a complete change of all microsoft specific files
because of the new line issue.
is this enough problem?
It will also make the diffs of online files much harder without using git.

I am not trying to make things complex, on the contrary!

Alon.

Re: [Openvpn-devel] [PATCH 4/6] build: msvc: upgrade to Visual Studio 2010 + fixups

2012-03-29 Thread michael-dev 

Hi,

On Thu, 29 Mar 2012 18:10:24 +0200, Alon Bar-Lev wrote:

For example...

at your end:
---
./configure
make
make dist
---

at other people end:
---
tar -xf 
cp -a openvpn* openvpn*.org
cd openvpn*
msvc-dev



cd ..
diff -urNp openvp* openvpn*.org
---

will result in a complete change of all microsoft specific files
because of the new line issue.
is this enough problem?


so why don't use --strip-trailing-cr (diffutils) or something similar 
to avoid this?


So as long as msvc-dev does accept eol=lf input files, storing them as 
eol=lf files is without issue?


Regards,
 M. Braun
--
[1] http://stackoverflow.com/questions/1889559/git-diff-to-ignore-m

Re: [Openvpn-devel] [PATCH 4/6] build: msvc: upgrade to Visual Studio 2010 + fixups

2012-03-29 Thread Alon Bar-Lev 
On Thu, Mar 29, 2012 at 7:26 PM, michael-dev  wrote:
> Hi,
>
> On Thu, 29 Mar 2012 18:10:24 +0200, Alon Bar-Lev wrote:
>> For example...
>>
>> at your end:
>> ---
>> ./configure
>> make
>> make dist
>> ---
>>
>> at other people end:
>> ---
>> tar -xf 
>> cp -a openvpn* openvpn*.org
>> cd openvpn*
>> msvc-dev
>> 
>> 
>> 
>> cd ..
>> diff -urNp openvp* openvpn*.org
>> ---
>>
>> will result in a complete change of all microsoft specific files
>> because of the new line issue.
>> is this enough problem?
>
> so why don't use --strip-trailing-cr (diffutils) or something similar
> to avoid this?
>
> So as long as msvc-dev does accept eol=lf input files, storing them as
> eol=lf files is without issue?

Hi,

Because I believe that file format should be as-is and these diff/git
magic should be done only when forced, when invalid action was taken.

Of course all had been better if Microsoft supported keeping the line
format, but this is not the case.

I want to see a "make dist" containing file format as it should be,
and Microsoft solution and project files should be CRLFed.

I truly don't understand... there is a simple solution of git to
explicit set eol style on specific files, why not use it?

And... also avoid using global setting of git, which is invalid anyway
as we maintain several projects which should be independent.

Alon.

Re: [Openvpn-devel] [PATCH 4/6] build: msvc: upgrade to Visual Studio 2010 + fixups

2012-04-01 Thread Alon Bar-Lev 
Maybe it will be easier for you to treat the Microsoft generated files
as binary blobs... these should remain as-is in all platforms, just
like any other binary blob.
The gitattributes patch I submitted does exactly that, without
interfering with the global setting if it you find this configuration
helpful.

On Thu, Mar 29, 2012 at 7:37 PM, Alon Bar-Lev  wrote:
> On Thu, Mar 29, 2012 at 7:26 PM, michael-dev  
> wrote:
>> Hi,
>>
>> On Thu, 29 Mar 2012 18:10:24 +0200, Alon Bar-Lev wrote:
>>> For example...
>>>
>>> at your end:
>>> ---
>>> ./configure
>>> make
>>> make dist
>>> ---
>>>
>>> at other people end:
>>> ---
>>> tar -xf 
>>> cp -a openvpn* openvpn*.org
>>> cd openvpn*
>>> msvc-dev
>>> 
>>> 
>>> 
>>> cd ..
>>> diff -urNp openvp* openvpn*.org
>>> ---
>>>
>>> will result in a complete change of all microsoft specific files
>>> because of the new line issue.
>>> is this enough problem?
>>
>> so why don't use --strip-trailing-cr (diffutils) or something similar
>> to avoid this?
>>
>> So as long as msvc-dev does accept eol=lf input files, storing them as
>> eol=lf files is without issue?
>
> Hi,
>
> Because I believe that file format should be as-is and these diff/git
> magic should be done only when forced, when invalid action was taken.
>
> Of course all had been better if Microsoft supported keeping the line
> format, but this is not the case.
>
> I want to see a "make dist" containing file format as it should be,
> and Microsoft solution and project files should be CRLFed.
>
> I truly don't understand... there is a simple solution of git to
> explicit set eol style on specific files, why not use it?
>
> And... also avoid using global setting of git, which is invalid anyway
> as we maintain several projects which should be independent.
>
> Alon.