Merge pull request #4 from mac-can/development

Release candidate 1 of version 1.0

.gitattributes

@@ -1,2 +1,5 @@
 # Auto detect text files and perform LF normalization
 * text=auto
+
+# Never modify line endings of bash scripts
+*.sh text eol=lf

.gitignore

@@ -1,5 +1,4 @@
 #.gitignore
-Sources/.svn
 Sources/build_no.h
 Trial/.objects
 Trial/.vs
@@ -15,19 +14,20 @@ Library/.objects
 Library/.vs
 Library/x64
 Library/x86
-Library/uvslcan
 Library/Debug_dll
 Library/Debug_lib
 Library/Release_dll
 Library/Release_lib
+Library/uvslcan
 Library/*.so.*
 Library/*.dylib
 Library/*.sln
 Library/*.aps
 Library/*.vcxproj.user
 slcan-cppcheck-build-dir
+checker.txt
 Binaries
 Includes
-Tests
+Testing
 .vscode
 *.log

Library/Makefile

@@ -1,7 +1,7 @@
 #
 #	Controller Area Network - Lawicel SLCAN Protocol (Serial-Line CAN)
 #
-#	Copyright (C) 2016-2024  Uwe Vogt, UV Software, Berlin ([email protected])
+#	Copyright (c) 2016-2024  Uwe Vogt, UV Software, Berlin ([email protected])
 #	All rights reserved.
 #
 #	This file is part of SLCAN.
@@ -49,9 +49,21 @@ current_OS := $(patsubst CYGWIN%,Cygwin,$(current_OS))
 current_OS := $(patsubst MINGW%,MinGW,$(current_OS))
 current_OS := $(patsubst MSYS%,MinGW,$(current_OS))
 
+MAJOR = 1
+MINOR = 0
+PATCH = 0
+
+ifeq ($(PATCH),0)
+VERSION = $(MAJOR).$(MINOR)
+else
+VERSION = $(MAJOR).$(MINOR).$(PATCH)
+endif
+
 HOME_DIR = ..
+MAIN_DIR = .
 
-SERIAL_DIR = $(HOME_DIR)/Sources
+SOURCE_DIR = $(HOME_DIR)/Sources
+SERIAL_DIR = $(SOURCE_DIR)
 
 OBJECTS = $(OUTDIR)/slcan.o $(OUTDIR)/serial.o \
 	$(OUTDIR)/buffer.o $(OUTDIR)/queue.o $(OUTDIR)/logger.o
@@ -61,16 +73,11 @@ ifeq ($(current_OS),Darwin) # macOS - libSLCAN.dylib
 
 LIBRARY = libSLCAN
 
-MAJOR = 0
-MINOR = 1
-PATCH = 0
-
-VERSION = $(MAJOR).$(MINOR).$(PATCH)
 TARGET  = $(LIBRARY).$(VERSION).dylib
 STATIC  = $(LIBRARY).a
 
 INSTALL_NAME = $(TARGET)
-CURRENT_VERSION = $(MAJOR).$(MINOR).0
+CURRENT_VERSION = $(MAJOR).$(MINOR).$(PATCH)
 COMPATIBILITY_VERSION = $(MAJOR).$(MINOR).0
 
 INSTALL = /usr/local/lib
@@ -81,7 +88,7 @@ DEFINES = -DOPTION_SLCAN_DYLIB=1 \
 	-DOPTION_SERIAL_DEBUG_LEVEL=0 \
 	-DOPTION_SLCAN_DEBUG_LEVEL=0
 
-HEADERS = -I$(SERIAL_DIR) \
+HEADERS = -I$(SOURCE_DIR) \
 
 LIBRARIES = -lpthread
 
@@ -117,11 +124,6 @@ ifeq ($(current_OS),$(filter $(current_OS),Linux Cygwin)) # linux - libslcan.so.
 
 LIBRARY = libslcan
 
-MAJOR = 0
-MINOR = 1
-PATCH = 0
-
-VERSION = $(MAJOR).$(MINOR).$(PATCH)
 SONAME  = $(LIBRARY).so.1
 TARGET  = $(SONAME).$(VERSION)
 STATIC  = $(LIBRARY).a
@@ -134,7 +136,7 @@ DEFINES = -DOPTION_SLCAN_SO=1 \
 	-DOPTION_SERIAL_DEBUG_LEVEL=0 \
 	-DOPTION_SLCAN_DEBUG_LEVEL=0
 
-HEADERS = -I$(SERIAL_DIR)
+HEADERS = -I$(SOURCE_DIR)
 
 CFLAGS += -fPIC -O2 -Wall -Wno-parentheses \
 	-fno-strict-aliasing \

Library/uvslcan.vcxproj

@@ -132,7 +132,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..\Sources;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\Sources;..\Sources;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -148,7 +148,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..\Sources;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\Sources;..\Sources;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -166,7 +166,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..\Sources;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\Sources;..\Sources;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -186,7 +186,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..\Sources;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\Sources;..\Sources;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -204,7 +204,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..\Sources;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\Sources;..\Sources;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -220,7 +220,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..\Sources;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\Sources;..\Sources;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -238,7 +238,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..\Sources;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\Sources;..\Sources;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -258,7 +258,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..\Sources;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\Sources;..\Sources;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -276,9 +276,9 @@
     <ClInclude Include="..\Sources\serial.h" />
     <ClInclude Include="..\Sources\serial_attr.h" />
     <ClInclude Include="..\Sources\slcan.h" />
-    <ClInclude Include="framework.h" />
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="resource.h" />
+    <ClInclude Include=".\Sources\framework.h" />
+    <ClInclude Include=".\Sources\pch.h" />
+    <ClInclude Include=".\Sources\resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\Sources\buffer_w.c">
@@ -331,8 +331,8 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_dll|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_lib|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="dllmain.cpp" />
-    <ClCompile Include="pch.cpp">
+    <ClCompile Include=".\Sources\dllmain.cpp" />
+    <ClCompile Include=".\Sources\pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_dll|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_lib|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_dll|Win32'">Create</PrecompiledHeader>

Library/uvslcan.vcxproj.filters

@@ -15,10 +15,10 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="framework.h">
+    <ClInclude Include=".\Sources\framework.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="pch.h">
+    <ClInclude Include=".\Sources\pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\Sources\buffer.h">
@@ -42,15 +42,15 @@
     <ClInclude Include="..\Sources\slcan.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include=".\Sources\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="dllmain.cpp">
+    <ClCompile Include=".\Sources\dllmain.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="pch.cpp">
+    <ClCompile Include=".\Sources\pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\Sources\buffer_w.c">

Makefile

@@ -1,7 +1,7 @@
 #
 #	Controller Area Network - Lawicel SLCAN Protocol (Serial-Line CAN)
 #
-#	Copyright (C) 2016-2024  Uwe Vogt, UV Software, Berlin ([email protected])
+#	Copyright (c) 2016-2024  Uwe Vogt, UV Software, Berlin ([email protected])
 #	All rights reserved.
 #
 #	This file is part of SLCAN.