Skip to content

Commit

Permalink
New attempt to move Appveyor CI scripts to ci/appveyor
Browse files Browse the repository at this point in the history
  • Loading branch information
jedisct1 committed Sep 11, 2023
1 parent 286530e commit e15f2f7
Show file tree
Hide file tree
Showing 14 changed files with 1,434 additions and 1,440 deletions.
4 changes: 0 additions & 4 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,13 @@ ACLOCAL_AMFLAGS = -I m4

EXTRA_DIST = \
autogen.sh \
libsodium.sln \
libsodium.vcxproj \
libsodium.vcxproj.filters \
LICENSE \
README.markdown \
THANKS

SUBDIRS = \
builds \
dist-build \
msvc-scripts \
src \
test

Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ init: msbuild /version

build:
parallel: true
project: libsodium.vcxproj
verbosity: minimal
project: ci/appveyor/libsodium.vcxproj
verbosity: normal
File renamed without changes.
595 changes: 595 additions & 0 deletions ci/appveyor/libsodium.vcxproj

Large diffs are not rendered by default.

816 changes: 816 additions & 0 deletions ci/appveyor/libsodium.vcxproj.filters

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.20/ < src\libsodium\include\sodium\version.h.in > tmp
cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.20/ < ..\..\src\libsodium\include\sodium\version.h.in > tmp
cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/28/ < tmp > tmp2
cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/0/ < tmp2 > tmp3
cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_MINIMAL_DEF@// < tmp3 > src\libsodium\include\sodium\version.h
cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_MINIMAL_DEF@// < tmp3 > ..\..\src\libsodium\include\sodium\version.h
del tmp tmp2 tmp3
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\src\libsodium\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<PreprocessorDefinitions>UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NATIVE_LITTLE_ENDIAN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>inline=__inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<PreBuildEvent>
<Command>"$(SolutionDir)/msvc-scripts/process.bat"</Command>
<Command>"$(SolutionDir)\msvc-scripts\process.bat"</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Process .in files</Message>
</PreBuildEvent>
<PostBuildEvent>
<Command>"$(SolutionDir)/test/default/wintest.bat" $(Configuration) $(Platform)</Command>
<Command>"$(SolutionDir)..\..\test\default\wintest.bat" $(Configuration) $(Platform)</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>Run the test suite</Message>
Expand Down
1 change: 0 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,6 @@ AC_CONFIG_FILES([Makefile
dist-build/Makefile
libsodium.pc
libsodium-uninstalled.pc
msvc-scripts/Makefile
src/Makefile
src/libsodium/Makefile
src/libsodium/include/Makefile
Expand Down
595 changes: 0 additions & 595 deletions libsodium.vcxproj

This file was deleted.

Loading

0 comments on commit e15f2f7

Please sign in to comment.