Skip to content

Commit

Permalink
Merge branch 'release/v3.1.0-beta'
Browse files Browse the repository at this point in the history
  • Loading branch information
rikyoz committed Sep 3, 2019
2 parents 8b8eeb0 + f3a167e commit 26862f4
Show file tree
Hide file tree
Showing 85 changed files with 6,624 additions and 2,081 deletions.
13 changes: 12 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*.pro.user
*.lastcodeanalysissucceeded
*.filters
*.vcxproj.user
.qmake.stash
lib/
build/
Expand All @@ -23,4 +24,14 @@ doc/rst/
doc/md/
test*/
.vs/
x64/
x64/
\.idea/

cmake-build-debug/

bit7z.sln
CMakeLists*\.txt

*.suppress

*.pro\.user*-pre1
84 changes: 47 additions & 37 deletions README.md

Large diffs are not rendered by default.

121 changes: 62 additions & 59 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,78 +1,81 @@
version: 3.0.1-build{build}
version: 3.1.0-build{build}
skip_non_tags: true
os: Visual Studio 2015
clone_depth: 1

image:
- Visual Studio 2015
- Visual Studio 2017
- Visual Studio 2019

build:
project: bit7z.vcxproj

matrix:
fast_finish: true

environment:
bit7z_version: 3.0.1
msvc_dir: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
bit7z_version: 3.1.0-beta

matrix:
# MSVC x86
- name: msvc2015_x86
arch: x86
qt_dir: C:\Qt\5.11\msvc2015\bin
- name: msvc_x86 # MSVC x86
platform: x86
fast_finish: true

# MSVC x86 MT
- name: msvc2015_mt_x86
arch: x86
- name: msvc_mt_x86 # MSVC x86 MT
platform: x86
mt: TRUE
qt_dir: C:\Qt\5.11\msvc2015\bin
fast_finish: true

# MSVC x64
- name: msvc2015_x64
arch: x64
qt_dir: C:\Qt\5.11\msvc2015_64\bin
- name: msvc_x64 # MSVC x64
platform: x64
fast_finish: true

# MSVC x64 MT
- name: msvc2015_mt_x64
arch: x64
- name: msvc_mt_x64 # MSVC x64 MT
platform: x64
mt: TRUE
qt_dir: C:\Qt\5.11\msvc2015_64\bin

init:
- set PATH=%PATH%;%msvc_dir%;%qt_dir%
- vcvarsall.bat %arch%

before_build:
- ps: Test-Path env:mt
- ps: if (Test-Path env:mt) {
${content} = (Get-Content bit7z.vcxproj);
${content} = ${content}.Replace("DLL</RuntimeLibrary>", "</RuntimeLibrary>");
Set-Content bit7z.vcxproj ${content};
}
- git submodule update --init --recursive

build_script:
- git submodule update --init --recursive
- mkdir build
- cd build
- if "%mt%"=="" (
qmake ..\bit7z.pro
) else (
qmake ..\bit7z.pro "QMAKE_CFLAGS_RELEASE = -O2 -MT" "QMAKE_CXXFLAGS_RELEASE = -O2 -MT" "QMAKE_CFLAGS_DEBUG = -Zi -MTd" "QMAKE_CXXFLAGS_DEBUG = -Zi -MTd"
)
- nmake release
- nmake debug
- cd ..
- mkdir pkg
- mkdir pkg\bit7z\
- mkdir pkg\bit7z\lib\
- mkdir pkg\bit7z\include\
- copy bin\%arch%\*.* pkg\bit7z\lib\
- copy include\bit*.hpp pkg\bit7z\include\
- copy README.md pkg\bit7z\
- copy LICENSE pkg\bit7z\
- echo %bit7z_version% %name% > pkg\bit7z\BUILD.txt
- cd pkg
- 7z a -t7z bit7z-v%bit7z_version%-%name%.7z *
- msbuild bit7z.vcxproj /p:configuration=release /p:platform=%platform%
- msbuild bit7z.vcxproj /p:configuration=debug /p:platform=%platform%

after_build:
- set msvc_ver=%APPVEYOR_BUILD_WORKER_IMAGE:Visual Studio =msvc%%name:msvc=%
- mkdir pkg
- mkdir pkg\bit7z\
- mkdir pkg\bit7z\lib\
- mkdir pkg\bit7z\include\
- copy bin\%platform%\*.* pkg\bit7z\lib\
- copy include\bit*.hpp pkg\bit7z\include\
- copy README.md pkg\bit7z\
- copy LICENSE pkg\bit7z\
- echo %bit7z_version% %msvc_ver% > pkg\bit7z\BUILD.txt
- cd pkg
- 7z a -t7z bit7z-v%bit7z_version%-%msvc_ver%.7z *

artifacts:
- path: pkg\*.7z
name: binary
- path: pkg\*.7z
name: binary

test: off

deploy:
provider: GitHub
release: $(APPVEYOR_REPO_TAG_NAME)
description: 'Binaries of Bit7z v%bit7z_version%'
auth_token:
secure: /WV4rvJOHuV7V0UVzX96DF61dznIJdluPBPIVDGKiQDz3EPQ0ETnyIJ8bDTLHUXT
artifact: /.*\.7z/
draft: true
prerelease: false
on:
# branch: master
appveyor_repo_tag: true
provider: GitHub
release: $(APPVEYOR_REPO_TAG_NAME)
description: 'Binaries of Bit7z v%bit7z_version%'
auth_token:
secure: /WV4rvJOHuV7V0UVzX96DF61dznIJdluPBPIVDGKiQDz3EPQ0ETnyIJ8bDTLHUXT
artifact: /.*\.7z/
draft: true
prerelease: false
on:
# branch: master
appveyor_repo_tag: true
50 changes: 35 additions & 15 deletions bit7z.pro
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#VERSION = 3.0.1
#VERSION = 3.1.0
TEMPLATE = lib
CONFIG += staticlib
CONFIG -= app_bundle
Expand All @@ -25,26 +25,36 @@ SOURCES += lib/7zSDK/C/Alloc.c \
src/bitextractor.cpp \
src/bitformat.cpp \
src/bitguids.cpp \
src/bitinputarchive.cpp \
src/bitmemcompressor.cpp \
src/bitmemextractor.cpp \
src/bitpropvariant.cpp \
src/bitstreamcompressor.cpp \
src/bitstreamextractor.cpp \
src/bufferextractcallback.cpp \
src/bufferupdatecallback.cpp \
src/callback.cpp \
src/coutmemstream.cpp \
src/coutmultivolstream.cpp \
src/cbufoutstream.cpp \
src/cmultivoloutstream.cpp \
src/cstdinstream.cpp \
src/cstdoutstream.cpp \
src/extractcallback.cpp \
src/fileextractcallback.cpp \
src/fileupdatecallback.cpp \
src/fsindexer.cpp \
src/fsitem.cpp \
src/fsutil.cpp \
src/memextractcallback.cpp \
src/memupdatecallback.cpp \
src/opencallback.cpp \
src/updatecallback.cpp \
src/util.cpp
src/streamextractcallback.cpp \
src/streamupdatecallback.cpp \
src/updatecallback.cpp

INCLUDEPATH += lib/7zSDK/CPP/

QMAKE_CFLAGS_WARN_ON = -W4
QMAKE_CXXFLAGS_WARN_ON = -W4
QMAKE_CFLAGS_WARN_ON -= -W3
QMAKE_CXXFLAGS_WARN_ON -= -W3
QMAKE_CFLAGS_WARN_ON += -W4 #-analyze
QMAKE_CXXFLAGS_WARN_ON += -W4 #-analyze

DEFINES += _UNICODE _7Z_VOL

Expand All @@ -56,27 +66,36 @@ HEADERS += include/bit7z.hpp \
include/bitarchiveitem.hpp \
include/bitarchiveopener.hpp \
include/bitcompressionlevel.hpp \
include/bitcompressionmethod.hpp \
include/bitcompressor.hpp \
include/bitexception.hpp \
include/bitextractor.hpp \
include/bitformat.hpp \
include/bitguids.hpp \
include/bitinputarchive.hpp \
include/bitmemcompressor.hpp \
include/bitmemextractor.hpp \
include/bitpropvariant.hpp \
include/bitstreamcompressor.hpp \
include/bitstreamextractor.hpp \
include/bittypes.hpp \
include/bufferextractcallback.hpp \
include/bufferupdatecallback.hpp \
include/callback.hpp \
include/coutmemstream.hpp \
include/coutmultivolstream.hpp \
include/cbufoutstream.hpp \
include/cmultivoloutstream.hpp \
include/cstdinstream.hpp \
include/cstdoutstream.hpp \
include/extractcallback.hpp \
include/fileextractcallback.hpp \
include/fileupdatecallback.hpp \
include/fsindexer.hpp \
include/fsitem.hpp \
include/fsutil.hpp \
include/memextractcallback.hpp \
include/memupdatecallback.hpp \
include/opencallback.hpp \
include/updatecallback.hpp \
include/util.hpp
include/streamextractcallback.hpp \
include/streamupdatecallback.hpp \
include/updatecallback.hpp

contains(QT_ARCH, i386) {
QMAKE_LFLAGS += /MACHINE:X86
Expand All @@ -91,6 +110,7 @@ CONFIG(debug, debug|release) {
BUILD = debug
BUILD_SUFFIX = _d
} else {
QMAKE_CXXFLAGS_RELEASE += /O2 /Os
BUILD = release
}

Expand Down
Loading

0 comments on commit 26862f4

Please sign in to comment.