Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
onlyoffice_core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
onlyoffice_core
Commits
decfeec7
Commit
decfeec7
authored
Aug 24, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release/v5.0.0' of
https://github.com/ONLYOFFICE/core
into release/v5.0.0
parents
50f47cae
89cd81ec
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
53 additions
and
15 deletions
+53
-15
.gitignore
.gitignore
+3
-0
Makefile
Makefile
+50
-15
No files found.
.gitignore
View file @
decfeec7
...
...
@@ -45,3 +45,6 @@ OfficeUtils/win32/OfficeUtilsLib/OfficeUtilsLib/ReadMe.txt
*.tlb
*.idb
**/.hg
*.zip
*.tar.gz
**/*.build/
Makefile
View file @
decfeec7
PRODUCT_NAME
?=
core
PRODUCT_VERSION
?=
0.0.0
BUILD_NUMBER
?=
0
PACKAGE_NAME
:=
$(PRODUCT_NAME)
UNAME_M
:=
$(
shell
uname
-m
)
ifeq
($(UNAME_M),x86_64)
ARCHITECTURE
:=
64
ARCH_SUFFIX
:=
x64
endif
ifneq
($(filter %86,$(UNAME_M)),)
ARCHITECTURE
:=
32
ARCH_SUFFIX
:=
x86
endif
ifeq
($(OS),Windows_NT)
PLATFORM
:=
win
EXEC_EXT
:=
.exe
SHELL_EXT
:=
.bat
SHARED_EXT
:=
.dll
LIB_EXT
:=
.lib
ARCH_EXT
:=
.zip
MAKE
:=
nmake
ifeq
($(PROCESSOR_ARCHITECTURE),AMD64)
ARCHITECTURE
:=
64
endif
ifeq
($(PROCESSOR_ARCHITECTURE),x86)
ARCHITECTURE
:=
32
endif
AR
:=
7z a
-y
PACKAGE_VERSION
:=
$(PRODUCT_VERSION)
.
$(BUILD_NUMBER)
ARCH_REPO_DIR
:=
windows
else
UNAME_S
:=
$(
shell
uname
-s
)
ifeq
($(UNAME_S),Linux)
...
...
@@ -19,14 +32,11 @@ else
SHELL_EXT
:=
.sh
LIB_EXT
:=
.a
LIB_PREFIX
:=
lib
ARCH_EXT
:=
.tar.gz
MAKE
:=
make
-j
$(
shell
grep
-c
^processor /proc/cpuinfo
)
endif
UNAME_M
:=
$(
shell
uname
-m
)
ifeq
($(UNAME_M),x86_64)
ARCHITECTURE
:=
64
endif
ifneq
($(filter %86,$(UNAME_M)),)
ARCHITECTURE
:=
32
AR
:=
tar
-zcvf
PACKAGE_VERSION
:=
$(PRODUCT_VERSION)
-
$(BUILD_NUMBER)
ARCH_REPO_DIR
:=
linux
endif
endif
...
...
@@ -229,6 +239,18 @@ PDFREADER_DEP += $(HTMLRENDERER)
PDFWRITER_DEP
+=
$(UNICODECONVERTER)
ARCHIVE
:=
./
$(PACKAGE_NAME)$(ARCH_EXT)
ARTIFACTS
+=
build/
*
ARTIFACTS
+=
Common/3dParty/
*
/
$(TARGET)
/build/
*
ifeq
($(OS),Windows_NT)
ARTIFACTS
+=
Common/3dParty/v8/
$(TARGET)
/
*
/
*
.dll
else
ARTIFACTS
+=
Common/3dParty/v8/
$(TARGET)
/
*
.S
endif
#Template for next statment:
#FOO_MAKE := $(basename $(FOO_PRO)).build/Makefile
#$(FOO): $(FOO_MAKE)
...
...
@@ -241,7 +263,7 @@ $$(value $(1)): $$(value $(1)_MAKE)
cd
$
$(
dir
$
$(
value
$(1)
_MAKE
))
&&
$(MAKE)
;
endef
.PHONY
:
all bin lib clean
.PHONY
:
all bin lib clean
deploy
all
:
lib bin
...
...
@@ -280,11 +302,24 @@ $(OOXMLSIGNATURE): $(OOXMLSIGNATURE_DEP)
%.build/Makefile
:
%.pro
mkdir
-p
$(
dir
$@
)
&&
cd
$(
dir
$@
)
&&
qmake
-r
$<
$(ARCHIVE)
:
$(AR)
$@
$(ARTIFACTS)
clean
:
rm
-rf
$(TARGETS)
rm
-rf
$(TARGETS)
$(ARCHIVE)
for
i
in
$(PROS)
;
do
\
if
[
-d
$$
i
-a
-f
$$
i/Makefile
]
;
then
\
cd
$$
i
&&
$(MAKE)
distclean
;
\
fi
\
done
deploy
:
$(ARCHIVE)
aws s3
cp
\
$(ARCHIVE)
\
s3://repo-doc-onlyoffice-com/
$(ARCH_REPO_DIR)
/
$(PACKAGE_NAME)
/
$(GIT_BRANCH)
/
$(PACKAGE_VERSION)
/
$(ARCH_SUFFIX)
/
\
-
-acl
public-read
aws
s3
sync
\
s3
:
//repo-doc-onlyoffice-com/$(ARCH_REPO_DIR)/$(PACKAGE_NAME)/$(GIT_BRANCH)/$(PACKAGE_VERSION)/$(ARCH_SUFFIX)/
\
s3://repo-doc-onlyoffice-com/
$(ARCH_REPO_DIR)
/
$(PACKAGE_NAME)
/
$(GIT_BRANCH)
/latest/
$(ARCH_SUFFIX)
/
\
-
-acl
public-read
--delete
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment