mkdirc

Signed-off-by: Cervenka Dusan <cervenka@acrios.com>

Author: Hadatko

.gitignore

@@ -107,3 +107,7 @@ format-files-to-commit.rb
 language\.settings\.xml
 *.vsix
 null.d
+boost.7z
+boost*/
+mingw.7z
+mingw64/

Makefile

@@ -71,18 +71,21 @@ test-serial: $(TESTDIR)
 .PHONY: fresh
 fresh: clean all
 
-define clean_fun
-	$(warning "$(at)$(POWERSHELL) "if (Test-Path $(1)) { $(rmc) $(1) }"")
-	$(at)$(POWERSHELL) 'if (Test-Path $(1)) { $(rmc) $(1) }'
-endef
+# define clean_fun
+# 	$(warning "$(at)$(POWERSHELL) "if (Test-Path $(1)) { $(rmc) $(1) }"")
+# 	$(at)$(POWERSHELL) 'if (Test-Path $(1)) { $(rmc) $(1) }'
+# endef
 
 # Target to clean everything.
 .PHONY: clean
 clean::
 	@echo "Deleting output directories..."
-	@$(call clean_fun,Debug,)
-	@$(call clean_fun,Release,)
-	@$(call clean_fun,erpc_outputs,)
+	@$(rmc) Debug Release
+	@$(rmc) out*.*
+	@$(rmc) erpc_outputs
+# 	@$(call clean_fun,Debug,)
+# 	@$(call clean_fun,Release,)
+# 	@$(call clean_fun,erpc_outputs,)
 	@echo "done."
 
 # Process subdirs

erpc_c/Makefile

@@ -113,7 +113,7 @@ include $(ERPC_ROOT)/mk/targets.mk
 
 $(TARGET_LIB)(%): %
 	@$(call printmessage,ar,Archiving, $(?F) in $(@F))
-	$(at)mkdir -p $(dir $(@))
+	$(at)$(mkdirc) -p $(dir $(@))
 	$(AR) $(ARFLAGS) $@ $?
 
 .PHONY: install
@@ -122,17 +122,17 @@ install: install_headers install_lib
 .PHONY: install_headers
 install_headers: $(HEADERS) |  $(INC_INSTALL_DIR)
 	@$(call printmessage,c,Installing, headers in $(INC_INSTALL_DIR))
-	$(at)mkdir -p $(INC_INSTALL_DIR)
+	$(at)$(mkdirc) -p $(INC_INSTALL_DIR)
 	$(at)install $(?) $(INC_INSTALL_DIR)
 
 $(INC_INSTALL_DIR):
-	$(at)mkdir -p $(INC_INSTALL_DIR)
+	$(at)$(mkdirc) -p $(INC_INSTALL_DIR)
 
 .PHONY: install_lib
 install_lib: $(TARGET_LIB)
 	@$(call printmessage,c,Installing, $(subst $(LIBS_ROOT)/,,$<) in $(LIB_INSTALL_DIR))
-	$(at)mkdir -p $(LIB_INSTALL_DIR)
+	$(at)$(mkdirc) -p $(LIB_INSTALL_DIR)
 	$(at)install $(TARGET_LIB) $(LIB_INSTALL_DIR)
 
 clean::
-	$(at)rm -rf $(OBJS_ROOT)/*.cpp $(OBJS_ROOT)/*.hpp $(OBJS_ROOT)/*.c
+	$(at)$(rmc) $(OBJS_ROOT)/*.cpp $(OBJS_ROOT)/*.hpp $(OBJS_ROOT)/*.c

erpcgen/Makefile

@@ -37,12 +37,13 @@ INCLUDES += $(ERPC_ROOT) \
 			$(ERPC_ROOT)/erpcgen/src/cpptemplate \
 			$(ERPC_ROOT)/erpcgen/src/types \
 			$(ERPC_ROOT)/erpc_c/infra \
-			$(OBJS_ROOT) \
-			$(BOOST_ROOT)/include
+			$(OBJS_ROOT)
 
 ifeq "$(is_mingw)" "1"
-INCLUDES += $(ERPC_ROOT)/windows \
-			$(BOOST_ROOT)
+INCLUDES += $(VISUAL_STUDIO_ROOT)/ \
+            $(BOOST_ROOT)/include/boost-$(BOOST_VERSION)
+else
+INCLUDES += $(BOOST_ROOT)/include
 endif
 
 SOURCES += $(OBJS_ROOT)/erpcgen_parser.tab.cpp \
@@ -86,15 +87,6 @@ SOURCES += $(OBJS_ROOT)/erpcgen_parser.tab.cpp \
             $(OBJS_ROOT)/erpcgen/src/templates/py_coders.c \
             $(OBJS_ROOT)/erpcgen/src/templates/py_global_init.c
 
-ifeq "$(is_mingw)" "1"
-SOURCES +=  $(ERPC_ROOT)/erpcgen/VisualStudio_v14/c_common_header.cpp \
-            $(ERPC_ROOT)/erpcgen/VisualStudio_v14/c_client_source.cpp \
-            $(ERPC_ROOT)/erpcgen/VisualStudio_v14/c_server_header.cpp \
-            $(ERPC_ROOT)/erpcgen/VisualStudio_v14/c_server_source.cpp \
-            $(ERPC_ROOT)/erpcgen/VisualStudio_v14/c_coders.cpp \
-            $(ERPC_ROOT)/erpcgen/VisualStudio_v14/c_common_functions.cpp \
-            $(OBJS_ROOT)/erpcgen/src/templates/c_crc.cpp
-else
 SOURCES +=  $(OBJS_ROOT)/erpcgen/src/templates/c_common_header.c \
             $(OBJS_ROOT)/erpcgen/src/templates/c_client_source.c \
             $(OBJS_ROOT)/erpcgen/src/templates/c_server_header.c \
@@ -109,18 +101,17 @@ SOURCES +=  $(OBJS_ROOT)/erpcgen/src/templates/c_common_header.c \
             $(OBJS_ROOT)/erpcgen/src/templates/py_interface.c \
             $(OBJS_ROOT)/erpcgen/src/templates/py_coders.c \
             $(OBJS_ROOT)/erpcgen/src/templates/py_global_init.c
-endif
 
 OBJECT_DEP := $(OBJS_ROOT)/erpcgen_lexer.cpp
 
 include $(ERPC_ROOT)/mk/targets.mk
 
 ifeq "$(is_mingw)" "1"
-    LIBRARIES += -L$(BOOST_ROOT)/stage/lib
+    LIBRARIES += -L$(BOOST_ROOT)/lib
     ifeq "$(build)" "release"
-        LIBRARIES += -lboost_system-mgw48-mt-d-1_57 -lboost_filesystem-mgw48-mt-d-1_57
+        LIBRARIES += -lboost_system-mgw12-mt-d-x64-$(BOOST_VERSION) -lboost_filesystem-mgw12-mt-d-x64-$(BOOST_VERSION)
     else
-        LIBRARIES += -lboost_system-mgw48-mt-1_57 -lboost_filesystem-mgw48-mt-1_57
+        LIBRARIES += -lboost_system-mgw12-mt-x64-$(BOOST_VERSION) -lboost_filesystem-mgw12-mt-x64-$(BOOST_VERSION)
     endif
 else
     ifeq "$(is_linux)" "1"
@@ -148,6 +139,8 @@ ifeq "$(build)" "release"
     endif
 endif
 
+CXXFLAGS += -DBOOST_FILESYSTEM_VERSION=4
+
 # Run flex
 $(OBJS_ROOT)/erpcgen_lexer.cpp: $(ERPC_ROOT)/erpcgen/src/erpcgen_lexer.l $(OBJS_ROOT)/erpcgen_parser.tab.hpp | $(OBJECTS_DIRS)
 	@$(call printmessage,orange,Generating, $(subst $(ERPC_ROOT)/,,$<))
@@ -168,8 +161,8 @@ $(OBJS_ROOT)/%.c: $(ERPC_ROOT)/%.template
 .PHONY: install
 install: $(MAKE_TARGET)
 	@$(call printmessage,c,Installing, erpcgen in $(BIN_INSTALL_DIR))
-	$(at)mkdir -p $(BIN_INSTALL_DIR)
+	$(at)$(mkdirc) -p $(BIN_INSTALL_DIR)
 	$(at)install $(MAKE_TARGET) $(BIN_INSTALL_DIR)
 
 clean::
-	$(at)rm -rf $(OBJS_ROOT)/*.cpp $(OBJS_ROOT)/*.hpp $(OBJS_ROOT)/*.c
+	$(at)$(rmc) $(OBJS_ROOT)/*.cpp $(OBJS_ROOT)/*.hpp $(OBJS_ROOT)/*.c

erpcgen/VisualStudio_v14/.gitignore

@@ -29,6 +29,8 @@ win_bison.exe
 win_flex.exe
 README.txt
 .vs
+changelog.md
+README.md
 
 #boost libraries
 boost_*

erpcgen/VisualStudio_v14/erpcgen.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -32,7 +32,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="custom_build_rules\win_flex_bison_custom_build.props" />
+    <Import Project="custom_build_rules\win_flex_bison\win_flex_bison_custom_build.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -61,7 +61,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\boost_1_67_0;$(ProjectDir);$(ProjectDir)\..\src\types;$(ProjectDir)\..\src;$(ProjectDir)\..\src\cpptemplate;$(ProjectDir)\..\src\common;$(ProjectDir)\..\..\erpc_c\infra;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\boost_1_81_0;$(ProjectDir);$(ProjectDir)\..\src\types;$(ProjectDir)\..\src;$(ProjectDir)\..\src\cpptemplate;$(ProjectDir)\..\src\common;$(ProjectDir)\..\..\erpc_c\infra;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <BrowseInformation>true</BrowseInformation>
       <MultiProcessorCompilation>false</MultiProcessorCompilation>
@@ -72,7 +72,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(ProjectDir)\boost_1_67_0\lib32-msvc-14.1;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ProjectDir)\boost_1_81_0\lib32-msvc-14.1;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <Bison>
       <OutputFile>$(ProjectDir)\%(Filename).tab.cpp</OutputFile>
@@ -120,7 +120,7 @@ python.exe ..\bin\txt_to_c.py --output .\py_global_init.cpp ..\src\templates\py_
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_RELEASE;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\boost_1_67_0;$(ProjectDir);$(ProjectDir)\..\src\types;$(ProjectDir)\..\src;$(ProjectDir)\..\src\cpptemplate;$(ProjectDir)\..\src\common;$(ProjectDir)\..\..\erpc_c\infra;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\boost_1_81_0;$(ProjectDir);$(ProjectDir)\..\src\types;$(ProjectDir)\..\src;$(ProjectDir)\..\src\cpptemplate;$(ProjectDir)\..\src\common;$(ProjectDir)\..\..\erpc_c\infra;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <MultiProcessorCompilation>false</MultiProcessorCompilation>
@@ -132,7 +132,7 @@ python.exe ..\bin\txt_to_c.py --output .\py_global_init.cpp ..\src\templates\py_
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(ProjectDir)\boost_1_67_0\lib32-msvc-14.1;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ProjectDir)\boost_1_81_0\lib32-msvc-14.1;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PreBuildEvent>
       <Command>python.exe ..\bin\txt_to_c.py --output .\c_coders.cpp ..\src\templates\c_coders.template
@@ -259,10 +259,10 @@ python.exe ..\bin\txt_to_c.py --output .\py_global_init.cpp ..\src\templates\py_
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="custom_build_rules\win_flex_bison_custom_build.targets" />
+    <Import Project="custom_build_rules\win_flex_bison\win_flex_bison_custom_build.targets" />
   </ImportGroup>
   <Target Name="GenerateTemplates">
     <Message Text="Generating templates" />
     <Exec Command="gen_templates.bat" />
   </Target>
-</Project>
+</Project>

erpcgen/VisualStudio_v14/readme_erpcgen.txt

@@ -12,22 +12,23 @@ Requirements
 2. Win flex-bison
 
     Direct link to the latests win flex-bison release download:
-        [https://sourceforge.net/projects/winflexbison]
+        [https://sourceforge.net/projects/winflexbison/files/win_flex_bison3-latest.zip/download]
+
 
     Extract win flex-bison zip contents directly into the erpc/erpcgen/VisualStudio_v14 directory
     (not into a subdirectory).
 
 3. boost [http://boost.org]
 
-    Direct link to the boost 1.67 release downloads:
-        [https://sourceforge.net/projects/boost/files/boost-binaries/1.67.0/]
+    Direct link to the boost 1.81 release downloads:
+        [https://sourceforge.net/projects/boost/files/boost-binaries/1.81.0/]
 
     Install binary for your version of visual studio (x86 architecture)
-    into current directory (for Visual Studio 2017: boost_1_67_0-msvc-14.1-32.exe):
+    into current directory (for Visual Studio 2017: boost_1_81_0-msvc-14.1-32.exe):
         erpc\erpcgen\VisualStudio_v14\
 
         whole path has to be:
-        erpc\erpcgen\VisualStudio_v14\boost_1_67_0\
+        erpc\erpcgen\VisualStudio_v14\boost_1_81_0\
 
     For different version of Visual Studio boost library you need update project:
         in Properties\Linker\General update Additional Library Directories
@@ -39,4 +40,3 @@ Visual Studio build output is available in these directories:
 
     erpc/erpcgen/VisualStudio_v14/Debug
     erpc/erpcgen/VisualStudio_v14/Release
-

erpcgen/src/cpptemplate/Makefile

@@ -41,8 +41,8 @@ all: cpptempl_test
 .PHONY: clean
 clean:
 	@echo "Cleaning output..."
-	@rm -rf *.o
-	@rm -rf *.d
+	@$(rmc) *.o
+	@$(rmc) *.d
 	@rm -f $(TARGET)
 
 .PHONY: test testv

erpcsniffer/Makefile

@@ -80,9 +80,9 @@ include $(ERPC_ROOT)/mk/targets.mk
 ifeq "$(is_mingw)" "1"
     LIBRARIES += -L$(BOOST_ROOT)/stage/lib
     ifeq "$(build)" "release"
-        LIBRARIES += -lboost_system-mgw48-mt-d-1_57 -lboost_filesystem-mgw48-mt-d-1_57
+        LIBRARIES += -lboost_system-mgw48-mt-d-1_81 -lboost_filesystem-mgw48-mt-d-1_81
     else
-        LIBRARIES += -lboost_system-mgw48-mt-1_57 -lboost_filesystem-mgw48-mt-1_57
+        LIBRARIES += -lboost_system-mgw48-mt-1_81 -lboost_filesystem-mgw48-mt-1_81
     endif
 else
     ifeq "$(is_linux)" "1"
@@ -130,8 +130,8 @@ $(OBJS_ROOT)/erpcgen_parser.tab.hpp: $(ERPC_ROOT)/erpcgen/src/erpcgen_parser.y |
 .PHONY: install
 install: $(MAKE_TARGET)
 	@$(call printmessage,c,Installing, erpcsniffer in $(BIN_INSTALL_DIR))
-	$(at)mkdir -p $(BIN_INSTALL_DIR)
+	$(at)$(mkdirc) -p $(BIN_INSTALL_DIR)
 	$(at)install $(MAKE_TARGET) $(BIN_INSTALL_DIR)
 
 clean::
-	$(at)rm -rf $(OBJS_ROOT)/*.cpp $(OBJS_ROOT)/*.hpp $(OBJS_ROOT)/*.c
+	$(at)$(rmc) $(OBJS_ROOT)/*.cpp $(OBJS_ROOT)/*.hpp $(OBJS_ROOT)/*.c

install_dependencies.ps1

@@ -0,0 +1,58 @@
+# Install 7zip
+$URL7Zip = "https://gist.githubusercontent.com/dansmith65/7dd950f183af5f5deaf9650f2ad3226c/raw/8b8f6e96de7469cea73c9fe63a5da4d44a7c1ba7/Install-7zip.ps1"
+$Path7Zip = ".\Install-7zip.ps1"
+Remove-Item -ErrorAction Ignore $Path7Zip
+Invoke-WebRequest -URI $URL7Zip -OutFile $Path7Zip
+powershell $Path7Zip
+Remove-Item -ErrorAction Ignore $Path7Zip
+$Path7zipApp="C:\Program Files\7-Zip\7z.exe"
+
+# Install mingw
+$URLMingw = "https://github.com/niXman/mingw-builds-binaries/releases/download/12.2.0-rt_v10-rev2/x86_64-12.2.0-release-win32-seh-ucrt-rt_v10-rev2.7z"
+$PathMingw7Zip = "mingw.7z"
+$PathMingw = "mingw64"
+$UnzipMingw = 'x',$PathMingw7Zip,'-y'
+Remove-Item -ErrorAction Ignore $PathMingw7Zip
+Remove-Item -ErrorAction Ignore $PathMingw
+Invoke-WebRequest -URI $URLMingw -OutFile $PathMingw7Zip
+& $Path7zipApp $UnzipMingw
+Remove-Item -ErrorAction Ignore $PathMingw7Zip
+
+# Install boost
+$PathBoostFolder="boost_1_81_0"
+$URLBoost = "https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/" + $PathBoostFolder + ".7z"
+$PatHBoost7Zip=".\boost.7z"
+$UnzipBoost = 'x',$PatHBoost7Zip,'-y'
+Remove-Item -ErrorAction Ignore $PatHBoost7Zip
+Remove-Item -ErrorAction Ignore $PathBoostFolder
+Invoke-WebRequest -URI $URLBoost -OutFile $PatHBoost7Zip
+& $Path7zipApp $UnzipBoost
+Remove-Item -ErrorAction Ignore $PatHBoost7Zip
+$env:Path += ';'+(Get-Location).tostring() + "\" + $PathMingw+"\bin"
+
+Set-Location ".\"$PathBoostFolder
+.\bootstrap.bat gcc
+.\b2 --build-type=complete toolset=gcc install
+Set-Location "..\"
+
+# Binson/flex
+Set-Location ".\erpcgen\VisualStudio_v14"
+$PatHBisonFlex7Zip=".\win_flex_bison.zip"
+$PatHBisonFlex="win_flex_bison"
+Remove-Item -ErrorAction Ignore $PatHBisonFlex7Zip
+Remove-Item -ErrorAction Ignore -Recurse $PatHBisonFlex
+Remove-Item -ErrorAction Ignore -Recurse ".\custom_build_rules"
+Remove-Item -ErrorAction Ignore -Recurse ".\data"
+Remove-Item -ErrorAction Ignore -Recurse ".\changelog.md"
+Remove-Item -ErrorAction Ignore -Recurse ".\FlexLexer.h"
+Remove-Item -ErrorAction Ignore -Recurse ".\README.md"
+Remove-Item -ErrorAction Ignore -Recurse ".\win_bison.exe"
+Remove-Item -ErrorAction Ignore -Recurse ".\win_flex.exe"
+$URLBisonFlex = "https://github.com/lexxmark/winflexbison/releases/download/v2.5.25/win_flex_bison-2.5.25.zip"
+Invoke-WebRequest -URI $URLBisonFlex -OutFile $PatHBisonFlex7Zip
+Expand-Archive -Path $PatHBisonFlex7Zip
+$PatHBisonFlexFull= ".\"+$PatHBisonFlex+"\*"
+Move-Item -Path $PatHBisonFlexFull -Destination .\ -force
+Remove-Item -ErrorAction Ignore $PatHBisonFlex7Zip
+# Remove-Item -ErrorAction Ignore -Recurse $PatHBisonFlex
+Set-Location "..\..\"