Skip to content

Commit

Permalink
Merge pull request #42 from dmpas/develop
Browse files Browse the repository at this point in the history
3.0.40
  • Loading branch information
dmpas authored Mar 18, 2017
2 parents 456bd72 + d503215 commit 4fcb76b
Show file tree
Hide file tree
Showing 10 changed files with 466 additions and 299 deletions.
10 changes: 7 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,19 @@ OUT_RELEASE = bin/Release/v8unpack

OBJ_RELEASE = $(OBJDIR_RELEASE)/src/V8File.o $(OBJDIR_RELEASE)/src/main.o
PREFIX=$(DESTDIR)/usr/bin
BASH_COMPLETION_PREFIX=$(DESTDIR)/etc/bash_completion.d

all: release

install:
install: $(OUT_RELEASE)
test -d $(PREFIX) || mkdir -p $(PREFIX)
cp bin/Release/v8unpack $(PREFIX)/v8unpack
test -d $(BASH_COMPLETION_PREFIX) || mkdir -p $(BASH_COMPLETION_PREFIX)
cp bash_completion.sh $(BASH_COMPLETION_PREFIX)/v8unpack

uninstall:
rm $(PREFIX)/v8unpack
rm $(BASH_COMPLETION_PREFIX)/v8unpack

clean: clean_release

Expand All @@ -56,10 +60,10 @@ release: $(OUT_RELEASE) after_release
$(OUT_RELEASE): bin/Release $(OBJ_RELEASE) $(DEP_RELEASE)
$(LD) $(LIBDIR_RELEASE) -o $(OUT_RELEASE) $(OBJ_RELEASE) $(LDFLAGS_RELEASE) $(LIB_RELEASE)

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

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

clean_release:
Expand Down
8 changes: 4 additions & 4 deletions VersionInfo.rc
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
1 VERSIONINFO
FILEVERSION 3,0,39,1
PRODUCTVERSION 3,0,39,1
FILEVERSION 3,0,40,1
PRODUCTVERSION 3,0,40,1
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "041904E3"
BEGIN
VALUE "CompanyName", "V8Unpack developers community"
VALUE "FileDescription", "V8 Unpack Tool"
VALUE "FileVersion", "3.0.39"
VALUE "FileVersion", "3.0.40"
VALUE "InternalName", "v8unpack"
VALUE "LegalCopyright", "Denis Demidov, Sergey Batanov and others"
VALUE "OriginalFilename", "v8unpack.exe"
VALUE "ProductName", "V8 Unpack Tool"
VALUE "ProductVersion", "3.0.39"
VALUE "ProductVersion", "3.0.40"
END
END

Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 3.0.39.{build}
version: 3.0.40.{build}
pull_requests:
do_not_increment_build_number: true
clone_depth: 1
Expand Down
19 changes: 19 additions & 0 deletions bash_completion.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
_v8unpack_complete()
{
local cur opts
COMPREPLY=()
cur="${COMP_WORDS[COMP_CWORD]}"
prev="${COMP_WORDS[COMP_CWORD]}"
opts="-unpack -pack -parse -build -inflate -deflate \
-list -example -bat -version"

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

COMPREPLY=( $(compgen -f ${cur}) )
return 0
}
complete -F _v8unpack_complete v8unpack

18 changes: 18 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
v8unpack (3.0.40-2~xenial) xenial; urgency=low

* Fixed build bug

-- Sergey Batanov <sergey.batanov@dmpas.ru> Fri, 17 Mar 2017 22:44:00 +0300

v8unpack (3.0.40-2~vivid) vivid; urgency=low

* Fixed build bug

-- Sergey Batanov <sergey.batanov@dmpas.ru> Fri, 17 Mar 2017 22:44:00 +0300

v8unpack (3.0.40-2~trusty) trusty; urgency=low

* Fixed build bug

-- Sergey Batanov <sergey.batanov@dmpas.ru> Fri, 17 Mar 2017 22:44:00 +0300

v8unpack (3.0.39-1~xenial) xenial; urgency=low

* Added -list mode
Expand Down
2 changes: 1 addition & 1 deletion rpm/v8unpack.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: v8unpack
Version: 3.0.38
Version: 3.0.40
Release: 1%{?dist}
Summary: Enterprise 8 unpack tool

Expand Down
Loading

0 comments on commit 4fcb76b

Please sign in to comment.