Skip to content

Commit d34bb1e

Browse files
dmpasdmpas
authored
Merge pull request #84 from e8tools/develop
release 43
2 parents 04a1175 + 768d611 commit d34bb1e

21 files changed

+2116
-2416
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ Makefile
1717
gmon.out
1818
/build
1919

20+
cmake-build-*/*
21+
.idea/*

‎.travis.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎CMakeLists.txt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@ else()
1010
set(RC_FILE "")
1111
endif()
1212

13-
set (V8UNPACK_SOURCES src/main.cpp src/V8File.cpp)
14-
set (V8UNPACK_HEADERS src/V8File.h src/version.h src/zconf.h src/zlib.h)
13+
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
1514

16-
if(MSVC)
15+
set (V8UNPACK_SOURCES src/main.cpp src/V8File.cpp src/utils.cpp src/placeholder216.cpp src/VersionFile.cpp)
16+
set (V8UNPACK_HEADERS src/V8File.h src/version.h src/zconf.h src/zlib.h src/VersionFile.h)
17+
18+
if((MSVC) AND (NOT DISABLE_SINGLE_FILE))
1719

1820
foreach(flag_var
19-
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
20-
CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
21+
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
22+
CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
2123

2224
if(${flag_var} MATCHES "/MD")
2325
string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
@@ -31,15 +33,15 @@ if(MSVC)
3133

3234
endif()
3335

34-
set(CMAKE_CXX_STANDARD 11)
36+
set(CMAKE_CXX_STANDARD 14)
3537
add_executable (v8unpack ${V8UNPACK_SOURCES} ${V8UNPACK_HEADERS} ${RC_FILE})
3638

3739
add_definitions (-DBOOST_ALL_NO_LIB)
3840
set (Boost_USE_STATIC_LIBS ON)
3941
set (Boost_USE_MULTITHREADED OFF)
4042
set (Boost_USE_STATIC_RUNTIME ON)
4143

42-
find_package (Boost 1.53 REQUIRED COMPONENTS filesystem system)
44+
find_package (Boost 1.53 REQUIRED COMPONENTS filesystem system iostreams)
4345

4446
include_directories (${Boost_INCLUDE_DIRS})
4547
target_link_libraries (v8unpack ${Boost_LIBRARIES})

‎Makefile

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ LD = g++
1212
WINDRES =
1313

1414
INC =
15-
CFLAGS = -Wall -std=c++11
15+
CFLAGS = -Wall -std=c++14
1616
RESINC =
1717
LIBDIR =
1818
LIB = -static -lz -lboost_filesystem -lboost_system
@@ -29,7 +29,8 @@ OBJDIR_RELEASE = obj/Release
2929
DEP_RELEASE =
3030
OUT_RELEASE = bin/Release/v8unpack
3131

32-
OBJ_RELEASE = $(OBJDIR_RELEASE)/src/V8File.o $(OBJDIR_RELEASE)/src/main.o
32+
OBJ_RELEASE = $(OBJDIR_RELEASE)/src/V8File.o $(OBJDIR_RELEASE)/src/main.o $(OBJDIR_RELEASE)/src/utils.o \
33+
$(OBJDIR_RELEASE)/src/VersionFile.o $(OBJDIR_RELEASE)/src/placeholder216.o
3334
PREFIX=$(DESTDIR)/usr/bin
3435
BASH_COMPLETION_PREFIX=$(DESTDIR)/etc/bash_completion.d
3536

@@ -60,12 +61,21 @@ release: $(OUT_RELEASE) after_release
6061
$(OUT_RELEASE): bin/Release $(OBJ_RELEASE) $(DEP_RELEASE)
6162
$(LD) $(LIBDIR_RELEASE) -o $(OUT_RELEASE) $(OBJ_RELEASE) $(LDFLAGS_RELEASE) $(LIB_RELEASE)
6263

63-
$(OBJDIR_RELEASE)/src/V8File.o: src/V8File.cpp src/V8File.h
64+
$(OBJDIR_RELEASE)/src/V8File.o: src/V8File.cpp src/V8File.h src/VersionFile.h
6465
$(CXX) -D__LINUX $(CFLAGS_RELEASE) $(INC_RELEASE) -c src/V8File.cpp -o $(OBJDIR_RELEASE)/src/V8File.o
6566

6667
$(OBJDIR_RELEASE)/src/main.o: src/main.cpp src/V8File.h
6768
$(CXX) -D__LINUX $(CFLAGS_RELEASE) $(INC_RELEASE) -c src/main.cpp -o $(OBJDIR_RELEASE)/src/main.o
6869

70+
$(OBJDIR_RELEASE)/src/utils.o: src/utils.cpp src/V8File.h
71+
$(CXX) -D__LINUX $(CFLAGS_RELEASE) $(INC_RELEASE) -c src/utils.cpp -o $(OBJDIR_RELEASE)/src/utils.o
72+
73+
$(OBJDIR_RELEASE)/src/VersionFile.o: src/VersionFile.cpp src/VersionFile.h
74+
$(CXX) -D__LINUX $(CFLAGS_RELEASE) $(INC_RELEASE) -c src/VersionFile.cpp -o $(OBJDIR_RELEASE)/src/VersionFile.o
75+
76+
$(OBJDIR_RELEASE)/src/placeholder216.o: src/placeholder216.cpp
77+
$(CXX) -D__LINUX $(CFLAGS_RELEASE) $(INC_RELEASE) -c src/placeholder216.cpp -o $(OBJDIR_RELEASE)/src/placeholder216.o
78+
6979
clean_release:
7080
rm -f $(OBJ_RELEASE) $(OUT_RELEASE)
7181
rm -rf bin/Release

‎VersionInfo.rc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
1 VERSIONINFO
2-
FILEVERSION 3,0,42,1
3-
PRODUCTVERSION 3,0,42,1
2+
FILEVERSION 3,0,43,1
3+
PRODUCTVERSION 3,0,43,1
44
BEGIN
55
BLOCK "StringFileInfo"
66
BEGIN
77
BLOCK "041904E3"
88
BEGIN
99
VALUE "CompanyName", "V8Unpack developers community"
1010
VALUE "FileDescription", "V8 Unpack Tool"
11-
VALUE "FileVersion", "3.0.42"
11+
VALUE "FileVersion", "3.0.43"
1212
VALUE "InternalName", "v8unpack"
13-
VALUE "LegalCopyright", "Denis Demidov, Sergey Batanov and others"
13+
VALUE "LegalCopyright", "Denis Demidov, Sergey Batanov, Sergey Rudakov and others"
1414
VALUE "OriginalFilename", "v8unpack.exe"
1515
VALUE "ProductName", "V8 Unpack Tool"
16-
VALUE "ProductVersion", "3.0.42"
16+
VALUE "ProductVersion", "3.0.43"
1717
END
1818
END
1919

‎appveyor.yml

Lines changed: 72 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,72 @@
1-
version: 3.0.42.{build}
2-
image: Visual Studio 2015
3-
pull_requests:
4-
do_not_increment_build_number: true
5-
clone_depth: 1
6-
environment:
7-
VCDIR: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\
8-
BOOST_ROOT: C:\Libraries\boost_1_60_0
9-
BOOST_LIBRARYDIR: C:\Libraries\boost_1_60_0\lib32-msvc-14.0
10-
BOOST_INCLUDEDIR: C:\Libraries\boost_1_60_0
11-
install:
12-
- cmd: >-
13-
appveyor DownloadFile https://github.com/madler/zlib/archive/v1.2.8.zip -FileName zlib-1.2.8.zip
14-
15-
7z x zlib-1.2.8.zip > NUL
16-
17-
cd zlib-1.2.8
18-
19-
md build
20-
21-
cd build
22-
23-
cmake -DCMAKE_SHARED_LINKER_FLAGS="/NODEFAULTLIB:MSVCRT" -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /D NDEBUG" ..
24-
25-
cmake --build . --config Release --target zlibstatic
26-
27-
copy zconf.h ..
28-
29-
cd ..
30-
31-
cd ..
32-
build_script:
33-
- cmd: >-
34-
"%VCDIR%"\vcvarsall.bat
35-
36-
cmake -G "Visual Studio 14" -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR%" -DBOOST_INCLUDEDIR="%BOOST_INCLUDEDIR%" -DZLIB_LIBRARY=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.8\build\Release\zlibstatic.lib -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.8 .
37-
38-
cmake --build . --config Release
39-
40-
after_build:
41-
- cmd: >-
42-
SET PATH=%PATH%;"C:/Program Files (x86)/WiX Toolset v3.11/bin"
43-
44-
candle v8unpack.wxs
45-
46-
light -out v8unpack-%APPVEYOR_BUILD_VERSION%.msi v8unpack.wixobj
47-
48-
choco pack
49-
50-
artifacts:
51-
- path: Release\*.exe
52-
name: v8unpack
53-
- path: v8unpack*.nupkg
54-
- path: v8unpack-*.msi
55-
name: installer
56-
deploy: off
1+
version: 3.0.43.{build}
2+
image:
3+
- Ubuntu1604
4+
- Visual Studio 2015
5+
for:
6+
-
7+
matrix:
8+
only:
9+
- image: Ubuntu1604
10+
init:
11+
- export CXX=g++-9 CC=gcc-9
12+
pull_requests:
13+
do_not_increment_build_number: true
14+
clone_depth: 1
15+
environment:
16+
VCDIR: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\
17+
BOOST_ROOT: C:\Libraries\boost_1_60_0
18+
BOOST_LIBRARYDIR: C:\Libraries\boost_1_60_0\lib32-msvc-14.0
19+
BOOST_INCLUDEDIR: C:\Libraries\boost_1_60_0
20+
install:
21+
- sh: sudo apt -y install libboost-filesystem-dev libboost-iostreams-dev libboost-system-dev zlib1g-dev
22+
- sh: sudo apt -y install debhelper build-essential devscripts fakeroot
23+
- cmd: >-
24+
appveyor DownloadFile https://github.com/madler/zlib/archive/v1.2.8.zip -FileName zlib-1.2.8.zip
25+
26+
7z x zlib-1.2.8.zip > NUL
27+
28+
cd zlib-1.2.8
29+
30+
md build
31+
32+
cd build
33+
34+
cmake -DCMAKE_SHARED_LINKER_FLAGS="/NODEFAULTLIB:MSVCRT" -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /D NDEBUG" ..
35+
36+
cmake --build . --config Release --target zlibstatic
37+
38+
copy zconf.h ..
39+
40+
cd ..
41+
42+
cd ..
43+
build_script:
44+
- cmd: >-
45+
"%VCDIR%"\vcvarsall.bat
46+
47+
cmake -G "Visual Studio 14" -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR%" -DBOOST_INCLUDEDIR="%BOOST_INCLUDEDIR%" -DZLIB_LIBRARY=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.8\build\Release\zlibstatic.lib -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.8 .
48+
49+
cmake --build . --config Release
50+
- sh: cmake .
51+
- cmake --build . --config Release
52+
after_build:
53+
- cmd: >-
54+
SET PATH=%PATH%;"C:/Program Files (x86)/WiX Toolset v3.11/bin"
55+
56+
candle v8unpack.wxs
57+
58+
light -out v8unpack-%APPVEYOR_BUILD_VERSION%.msi v8unpack.wixobj
59+
60+
choco pack
61+
62+
- sh: debuild -us -uc && mv -t . ../v8unpack*.deb
63+
64+
artifacts:
65+
- path: Release\*.exe
66+
name: v8unpack
67+
- path: v8unpack*.nupkg
68+
- path: v8unpack-*.msi
69+
name: installer
70+
- path: v8unpack*.deb
71+
name: installer-deb
72+
deploy: off

‎bash_completion.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ _v8unpack_complete()
55
cur="${COMP_WORDS[COMP_CWORD]}"
66
prev="${COMP_WORDS[COMP_CWORD]}"
77
opts="-unpack -pack -parse -build -inflate -deflate \
8-
-list -example -bat -version"
8+
-list -example -bat -version -listfiles"
99

1010
if [[ ${COMP_CWORD} == 1 ]] ; then
1111
COMPREPLY=( $(compgen -W "$opts" -- ${cur}) )

‎debian/changelog

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
v8unpack (3.0.43-2~bionic) xenial; urgency=low
2+
3+
* Format 8.3.16 support
4+
* Minor fixes
5+
6+
-- Sergey Batanov <sergey.batanov@dmpas.ru> Thu, 03 Feb 2022 10:19:50 +0300
7+
8+
v8unpack (3.0.43-2~xenial) xenial; urgency=low
9+
10+
* Format 8.3.16 support
11+
* Minor fixes
12+
13+
-- Sergey Batanov <sergey.batanov@dmpas.ru> Thu, 03 Feb 2022 10:19:50 +0300
14+
15+
v8unpack (3.0.43-2~trusty) xenial; urgency=low
16+
17+
* Format 8.3.16 support
18+
* Minor fixes
19+
20+
-- Sergey Batanov <sergey.batanov@dmpas.ru> Thu, 03 Feb 2022 10:19:50 +0300
21+
122
v8unpack (3.0.40-2~xenial) xenial; urgency=low
223

324
* Fixed build bug

‎debian/copyright

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Source: https://github.com/dmpas/v8unpack
44

55
Files: *
66
Copyright: 2008 Denis Demidov
7-
2014-2017 Sergey Batanov <sergey.batanov@dmpas.ru>
7+
2014-2022 Sergey Batanov <sergey.batanov@dmpas.ru>
8+
2019-2020 fishca <fishcaroot@gmail.com>
89
License: Mozilla Public License 2.0
910

0 commit comments

Comments
 (0)