Merge 75c9f1e into 7206fa0

sakura-editor · May 7, 2021 · a28a93c · a28a93c
2 parents 7206fa0 + 75c9f1e
commit a28a93c
Show file tree

Hide file tree

Showing 21 changed files with 1,537 additions and 55 deletions.
diff --git a/.github/workflows/sonarscan.yml b/.github/workflows/sonarscan.yml
@@ -107,7 +107,7 @@ jobs:
         --working_dir .\${{ env.BUILD_PLATFORM }}\${{ env.BUILD_CONFIGURATION }}
         --cover_children
         --
-        .\tests\build\${{ env.BUILD_PLATFORM }}\${{ env.BUILD_CONFIGURATION }}\unittests\tests1.exe
+        .\${{ env.BUILD_PLATFORM }}\${{ env.BUILD_CONFIGURATION }}\tests1.exe
         --gtest_output=xml:${{ github.workspace }}\tests1-googletest.xml
 
     - name: Set up JDK 11
@@ -147,4 +147,4 @@ jobs:
         -D"sonar.cfamily.threads=2" `
         -D"sonar.coverage.exclusions=help\**\*.js,tests\unittests\coverage.cpp,tools\**\*.js" `
         -D"sonar.coverageReportPaths=tests1-coverage.xml" `
-        -D"sonar.exclusions=.sonar\**\*,bw-output\**\*,HeaderMake\**\*,tests\build\**\*,tests\googletest\**\*,**\test-*,tests*-*.xml"
+        -D"sonar.exclusions=.sonar\**\*,bw-output\**\*,HeaderMake\**\*,build\**\*,tests\googletest\**\*,**\test-*,tests*-*.xml"
diff --git a/HeaderMake/HeaderMake.vcxproj b/HeaderMake/HeaderMake.vcxproj
@@ -35,18 +35,17 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros">
+    <IntDir>$(SolutionDir)build\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
   <PropertyGroup>
     <_ProjectFileVersion>15.0.27130.2020</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/build-gnu.bat b/build-gnu.bat
@@ -1,21 +1,18 @@
-@echo off
-set platform=%1
-set configuration=%2
+set PLATFORM=%1
+set CONFIGURATION=%2
 
-if "%platform%" == "MinGW" (
+if "%PLATFORM%" == "MinGW" (
 	@rem OK
 ) else (
 	call :showhelp %0
 	exit /b 1
 )
 
-if "%configuration%" == "Release" (
-	@rem OK
+if "%CONFIGURATION%" == "Release" (
     set MYDEFINES=-DNDEBUG
     set MYCFLAGS=-O2
     set MYLIBS=-s
-) else if "%configuration%" == "Debug" (
-	@rem OK
+) else if "%CONFIGURATION%" == "Debug" (
     set MYDEFINES=-D_DEBUG
     set MYCFLAGS=-g -O0
     set MYLIBS=
@@ -26,14 +23,51 @@ if "%configuration%" == "Release" (
 
 @rem https://www.appveyor.com/docs/environment-variables/
 @rem path=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;%path%
-path=C:\msys64\mingw64\bin;%path%
+path=C:\msys64\mingw64\bin;%path:C:\msys64\mingw64\bin;=%
+
+@rem create output directory, all executables will be placed here.
+set OUTDIR=../../../../%PLATFORM%/%CONFIGURATION%
+mkdir "%~dp0%PLATFORM%\%CONFIGURATION%" > NUL 2>&1
 
-@echo mingw32-make -C sakura_core MYDEFINES="%MYDEFINES%" MYCFLAGS="%MYCFLAGS%" MYLIBS="%MYLIBS%"
-mingw32-make -C sakura_core MYDEFINES="%MYDEFINES%" MYCFLAGS="%MYCFLAGS%" MYLIBS="%MYLIBS%" -j4
+@rem build "sakura_core".
+set SAKURA_CORE_MAKEFILE=%~dp0sakura_core\Makefile
+set SAKURA_CORE_BUILD_DIR=%~dp0build\%PLATFORM%\%CONFIGURATION%\sakura_core
+mkdir "%SAKURA_CORE_BUILD_DIR%" > NUL 2>&1
+pushd "%SAKURA_CORE_BUILD_DIR%"
+mingw32-make -f "%SAKURA_CORE_MAKEFILE%" MYDEFINES="%MYDEFINES%" MYCFLAGS="%MYCFLAGS%" MYLIBS="%MYLIBS%" OUTDIR=%OUTDIR% StdAfx.h.gch sakura_rc.o && mingw32-make -f "%SAKURA_CORE_MAKEFILE%" MYDEFINES="%MYDEFINES%" MYCFLAGS="%MYCFLAGS%" MYLIBS="%MYLIBS%" OUTDIR=%OUTDIR% -j4
 if errorlevel 1 (
 	echo error 2 errorlevel %errorlevel%
+	popd
 	exit /b 1
 )
+popd
+
+@rem build "sakura_lang_en_US".
+set SAKURA_LANG_EN_US_MAKEFILE=%~dp0sakura_lang_en_US\Makefile
+set SAKURA_LANG_EN_US_BUILD_DIR=%~dp0build\%PLATFORM%\%CONFIGURATION%\sakura_lang_en_US
+mkdir "%SAKURA_LANG_EN_US_BUILD_DIR%" > NUL 2>&1
+pushd "%SAKURA_LANG_EN_US_BUILD_DIR%"
+mingw32-make -f "%SAKURA_LANG_EN_US_MAKEFILE%" MYDEFINES="%MYDEFINES%" SAKURA_CORE=../sakura_core OUTDIR=%OUTDIR%
+if errorlevel 1 (
+	echo error 2 errorlevel %errorlevel%
+	popd
+	exit /b 1
+)
+popd
+
+@rem build "tests1".
+set TESTS1_MAKEFILE=%~dp0tests\unittests\Makefile
+set TESTS1_BUILD_DIR=%~dp0build\%PLATFORM%\%CONFIGURATION%\tests1
+mkdir "%TESTS1_BUILD_DIR%" > NUL 2>&1
+pushd "%TESTS1_BUILD_DIR%"
+mingw32-make -f "%TESTS1_MAKEFILE%" MYDEFINES="%MYDEFINES%" SAKURA_CORE=../sakura_core OUTDIR=%OUTDIR% -j4
+if errorlevel 1 (
+	echo error 2 errorlevel %errorlevel%
+	popd
+	exit /b 1
+)
+popd
+
 exit /b 0
 
 
@@ -44,11 +78,12 @@ exit /b 0
 :showhelp
 @echo off
 @echo usage
-@echo    %~nx1 platform configuration
+@echo    %~nx1 PLATFORM CONFIGURATION
 @echo.
 @echo parameter
-@echo    platform      : MinGW
-@echo    configuration : Release or Debug
+@echo    PLATFORM      : MinGW
+@echo    CONFIGURATION : Release or Debug
+@echo    BUILD_BASE    : (optional) Path to build directory.
 @echo.
 @echo example
 @echo    %~nx1 MinGW Release

diff --git a/ci/azure-pipelines/template.job.build-on-msys2.yml b/ci/azure-pipelines/template.job.build-on-msys2.yml
@@ -37,7 +37,7 @@ jobs:
     displayName: Build with MinGW-w64-gcc
 
   # Unit tests
-  - script: tests\build-and-test.bat $(BuildPlatform) $(Configuration)
+  - script: tests\run-tests.bat $(BuildPlatform) $(Configuration)
     displayName: Unit test
 
   # see https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/utility/copy-files?view=azure-devops&tabs=yaml

diff --git a/sakura/sakura.vcxproj b/sakura/sakura.vcxproj
@@ -62,28 +62,23 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros">
+    <IntDir>$(SolutionDir)build\$(Platform)\$(Configuration)\sakura_core\</IntDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
   <PropertyGroup>
     <_ProjectFileVersion>15.0.27130.2020</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -1017,6 +1012,7 @@
   </ImportGroup>
   <Import Project="..\sakura\githash.targets" />
   <Import Project="..\sakura\funccode.targets" />
+  <Import Project="..\tests\compiletests.targets" />
   <Target Name="AppendCleanTargets" BeforeTargets="CoreClean">
     <!-- Add files to @Clean just before running CoreClean. -->
     <ItemGroup>

diff --git a/sakura_core/Makefile b/sakura_core/Makefile
@@ -31,6 +31,7 @@ DIRSEP = $(strip \ )
 DEVNULL = NUL
 ICONV = C:\msys64\usr\bin\iconv.exe
 SED = C:\msys64\usr\bin\sed.exe
+TAR = tar
 else
 # If unix-like shell is used.
 MKDIR = mkdir -p
@@ -39,6 +40,7 @@ DIRSEP = /
 DEVNULL = /dev/null
 ICONV = iconv
 SED = sed
+TAR = tar
 endif
 
 ifndef PREFIX
@@ -100,6 +102,8 @@ LIBS= \
  $(MYLIBS)
 
 exe= $(or $(OUTDIR),.)/sakura.exe
+bregonig= $(or $(OUTDIR),.)/bregonig.dll
+ctags= $(or $(OUTDIR),.)/ctags.exe
 
 SRCS = $(wildcard $(SRCDIR)/*.cpp) \
        $(wildcard $(SRCDIR)/*/*.cpp) \
@@ -120,11 +124,19 @@ GENERATED_FILES= \
 HEADERMAKETOOLDIR= $(SRCDIR)/../HeaderMake
 HEADERMAKE= $(or $(OUTDIR),$(HEADERMAKETOOLDIR))/HeaderMake.exe
 
-all: $(exe)
+all: $(exe) \
+     $(bregonig) \
+     $(ctags)
 
 $(exe): $(OBJS) sakura_rc.o
 	$(CXX) -o $@ $(OBJS) sakura_rc.o $(LIBS)
 
+$(bregonig): $(SRCDIR)/../installer/externals/bregonig/bron420.zip
+	$(TAR) xf $< -O x64/bregonig.dll > $@
+
+$(ctags): $(SRCDIR)/../installer/externals/universal-ctags/ctags-2020-01-12_feffe43a-x64.zip
+	$(TAR) xf $< ctags.exe
+
 Funccode_define.h: Funccode_x.hsrc $(HEADERMAKE)
 	$(HEADERMAKE) -in=$< -out=$@ -mode=define
 
@@ -152,7 +164,7 @@ sakura_rc.o: sakura_rc.rc.utf8 sakura_rc.rc2.utf8 githash.h Funccode_define.h
 	$(RC) -c utf-8 --language=0411 $(DEFINES) -I. -I$(SRCDIR) $< -o $@
 
 sakura_rc.rc.utf8 sakura_rc.rc2.utf8: sakura_rc.rc sakura_rc.rc2
-	$(ICONV) -f utf-16 -t utf-8 $(subst .utf8,,$(@F)) | $(SED) -e 1i'#pragma code_page(65001)' -e '/#include/s/.rc2\b/.rc2.utf8/' > $@
+	$(ICONV) -f utf-16 -t utf-8 $(SRCDIR)/$(subst .utf8,,$(@F)) | $(SED) -e 1i'#pragma code_page(65001)' -e '/#include/s/.rc2\b/.rc2.utf8/' > $@
 
 clean:
 	-$(RM) $(subst /,$(DIRSEP),$(exe) $(OBJS) $(HEADERMAKE)) StdAfx.h.gch $(GENERATED_FILES) sakura_rc.o sakura_rc.*.utf8

diff --git a/sakura_lang_en_US/Makefile b/sakura_lang_en_US/Makefile
@@ -37,12 +37,16 @@ MKDIR = md
 RM = del
 DIRSEP = $(strip \ )
 DEVNULL = NUL
+ICONV = C:\msys64\usr\bin\iconv.exe
+SED = C:\msys64\usr\bin\sed.exe
 else
 # If unix-like shell is used.
 MKDIR = mkdir -p
 RM = rm -f
 DIRSEP = /
 DEVNULL = /dev/null
+ICONV = iconv
+SED = sed
 endif
 
 ifndef PREFIX
@@ -97,9 +101,12 @@ ifneq ($(SAKURA_CORE),.)
 endif
 	$(MAKE) -f $< -C $(@D) $(@F)
 
-sakura_lang_rc.o: sakura_lang_rc.rc $(sakura_rc)
+sakura_lang_rc.o: sakura_lang_rc.rc.utf8 sakura_lang_rc.rc2.utf8 $(sakura_rc)
 	$(RC) -c utf-8 --language=0409 $(DEFINES) -I$(SAKURA_CORE) -I$(SRCDIR)/../sakura_core $< -o $@
 
+sakura_lang_rc.rc.utf8 sakura_lang_rc.rc2.utf8: sakura_lang_rc.rc sakura_lang_rc.rc2
+	$(ICONV) -f utf-16 -t utf-8 $(SRCDIR)/$(subst .utf8,,$(@F)) | $(SED) -e 1i'#pragma code_page(65001)' -e '/#include/s/.rc2\b/.rc2.utf8/' > $@
+
 clean:
 	-$(RM) $(subst /,$(DIRSEP),$(dll) $(OBJS))
 

diff --git a/sakura_lang_en_US/sakura_lang_en_US.vcxproj b/sakura_lang_en_US/sakura_lang_en_US.vcxproj
@@ -50,31 +50,26 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros">
+    <IntDir>$(SolutionDir)build\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
   <PropertyGroup>
     <_ProjectFileVersion>15.0.27130.2020</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <IgnoreImportLibrary>true</IgnoreImportLibrary>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <IgnoreImportLibrary>true</IgnoreImportLibrary>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <IgnoreImportLibrary>true</IgnoreImportLibrary>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <IgnoreImportLibrary>true</IgnoreImportLibrary>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>

diff --git a/tests/compiletests.targets b/tests/compiletests.targets
@@ -1,12 +1,17 @@
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="CompileTest">
     <CompileTestSourceDir>$(MSBuildThisFileDirectory)compiletests\</CompileTestSourceDir>
-    <CompileTestBuildDir>$(MSBuildThisFileDirectory)build\$(Platform)\$(Configuration)\compiletests\</CompileTestBuildDir>
+    <CompileTestBuildDir>$(SolutionDir)build\$(Platform)\$(Configuration)\compiletests\</CompileTestBuildDir>
   </PropertyGroup>
+  <ItemGroup>
+    <CompileTestTarget Include="..\sakura_core\basis\CLaxInteger.h" />
+    <CompileTestTarget Include="..\sakura_core\basis\CStrictInteger.h" />
+    <CompileTestTarget Include="..\sakura_core\basis\SakuraBasis.h" />
+  </ItemGroup>
   <Target Name="MakeCompileTestBuildDir" Condition="!Exists('$(CompileTestBuildDir)')">
     <MakeDir Directories="$(CompileTestBuildDir)" />
   </Target>
-  <Target Name="RunCompileTests" DependsOnTargets="MakeCompileTestBuildDir" BeforeTargets="ClCompile" Condition="!Exists('$(CompileTestBuildDir)CMakeCache.txt')">
+  <Target Name="RunCompileTests" DependsOnTargets="MakeCompileTestBuildDir" BeforeTargets="ClCompile" Inputs="@(CompileTestTarget)" Outputs="$(CompileTestBuildDir)CMakeCache.txt">
     <PropertyGroup>
       <VsVersion>$([System.Text.RegularExpressions.Regex]::Replace('$(VisualStudioVersion)', '^(\d+).*', '$1'))</VsVersion>
     </PropertyGroup>

diff --git a/tests/googletest.targets b/tests/googletest.targets
@@ -1,8 +1,8 @@
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="GoogleTest">
     <GoogleTestSourceDir>$(MSBuildThisFileDirectory)googletest</GoogleTestSourceDir>
-    <GoogleTestBuildDir>$(MSBuildThisFileDirectory)build\$(Platform)\$(Configuration)\gtest_build\</GoogleTestBuildDir>
-    <GoogleTestInstallDir>$([MsBuild]::NormalizePath('$(GoogleTestBuildDir)..\googletest\'))</GoogleTestInstallDir>
+    <GoogleTestBuildDir>$(SolutionDir)build\$(Platform)\$(Configuration)\gtest_build\</GoogleTestBuildDir>
+    <GoogleTestInstallDir>$(SolutionDir)build\$(Platform)\$(Configuration)\googletest\</GoogleTestInstallDir>
     <IncludePath>$(GoogleTestInstallDir)include;$(IncludePath)</IncludePath>
     <GoogleTestLibInstallDir Condition="'$(Platform)' == 'Win32'">$(GoogleTestInstallDir)lib</GoogleTestLibInstallDir>
     <GoogleTestLibInstallDir Condition="'$(Platform)' == 'x64'">$(GoogleTestInstallDir)lib64</GoogleTestLibInstallDir>