Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
I
inary
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
1
Konular (issue)
1
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
SulinOS
inary
Commits
7b0e373f
Kaydet (Commit)
7b0e373f
authored
Şub 08, 2020
tarafından
Your Name
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
build sıralaması ve mantığı düzenlendi
üst
d35b621d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
10 deletions
+11
-10
archive.py
inary/archive.py
+2
-2
build.py
inary/operations/build.py
+9
-8
No files found.
inary/archive.py
Dosyayı görüntüle @
7b0e373f
...
@@ -902,7 +902,7 @@ class SourceArchive:
...
@@ -902,7 +902,7 @@ class SourceArchive:
# check hash
# check hash
if
util
.
check_file_hash
(
self
.
archiveFile
,
self
.
archive
.
sha1sum
)
or
ctx
.
get_option
(
'ignore_verify'
):
if
util
.
check_file_hash
(
self
.
archiveFile
,
self
.
archive
.
sha1sum
)
or
ctx
.
get_option
(
'ignore_verify'
):
if
interactive
:
if
interactive
and
ctx
.
config
.
get_option
(
'debug'
)
:
ctx
.
ui
.
info
(
_
(
'
\"
{}
\"
[cached]'
)
.
format
(
self
.
archive
.
name
))
ctx
.
ui
.
info
(
_
(
'
\"
{}
\"
[cached]'
)
.
format
(
self
.
archive
.
name
))
return
True
return
True
...
@@ -912,7 +912,7 @@ class SourceArchive:
...
@@ -912,7 +912,7 @@ class SourceArchive:
# check archive file's integrity
# check archive file's integrity
if
not
util
.
check_file_hash
(
self
.
archiveFile
,
self
.
archive
.
sha1sum
):
if
not
util
.
check_file_hash
(
self
.
archiveFile
,
self
.
archive
.
sha1sum
):
ctx
.
ui
.
warning
(
_
(
"
* Expected sha1 value: {}
\n
* Received sha1 value: {}
\n
"
.
format
(
self
.
archive
.
sha1sum
,
util
.
sha1_file
(
self
.
archiveFile
))))
ctx
.
ui
.
warning
(
_
(
"
{}
\n
*Expected sha1 value: {}
\n
* Received sha1 value: {}
\n
"
.
format
(
self
.
url
.
filename
(),
self
.
archive
.
sha1sum
,
util
.
sha1_file
(
self
.
archiveFile
))))
if
not
ctx
.
get_option
(
'ignore_verify'
):
if
not
ctx
.
get_option
(
'ignore_verify'
):
raise
SourceArchiveError
(
_
(
"unpack: check_file_hash failed."
))
raise
SourceArchiveError
(
_
(
"unpack: check_file_hash failed."
))
else
:
else
:
...
...
inary/operations/build.py
Dosyayı görüntüle @
7b0e373f
...
@@ -355,6 +355,7 @@ class Builder:
...
@@ -355,6 +355,7 @@ class Builder:
self
.
fetch_component
()
self
.
fetch_component
()
self
.
fetch_source_archives
()
self
.
fetch_source_archives
()
util
.
clean_dir
(
self
.
pkg_install_dir
())
for
build_type
in
self
.
build_types
:
for
build_type
in
self
.
build_types
:
self
.
set_build_type
(
build_type
)
self
.
set_build_type
(
build_type
)
self
.
unpack_source_archives
()
self
.
unpack_source_archives
()
...
@@ -364,11 +365,14 @@ class Builder:
...
@@ -364,11 +365,14 @@ class Builder:
if
self
.
has_icecream
:
if
self
.
has_icecream
:
ctx
.
ui
.
info
(
_
(
"IceCream detected. Make sure your daemon "
ctx
.
ui
.
info
(
_
(
"IceCream detected. Make sure your daemon "
"is up and running..."
))
"is up and running..."
))
for
build_type
in
self
.
build_types
:
self
.
run_setup_action
()
self
.
run_setup_action
()
for
build_type
in
self
.
build_types
:
self
.
run_build_action
()
self
.
run_build_action
()
for
build_type
in
self
.
build_types
:
if
ctx
.
get_option
(
'debug'
)
and
not
ctx
.
get_option
(
'ignore_check'
):
if
ctx
.
get_option
(
'debug'
)
and
not
ctx
.
get_option
(
'ignore_check'
):
self
.
run_check_action
()
self
.
run_check_action
()
for
build_type
in
self
.
build_types
:
self
.
run_install_action
()
self
.
run_install_action
()
# after all, we are ready to build/prepare the packages
# after all, we are ready to build/prepare the packages
...
@@ -555,7 +559,7 @@ class Builder:
...
@@ -555,7 +559,7 @@ class Builder:
def
unpack_source_archives
(
self
):
def
unpack_source_archives
(
self
):
ctx
.
ui
.
status
(
_
(
"Building source package:
\"
{}
\"
[ Unpacking Step ]"
)
.
format
(
self
.
spec
.
source
.
name
),
ctx
.
ui
.
status
(
_
(
"Building source package:
\"
{}
\"
[ Unpacking Step ]"
)
.
format
(
self
.
spec
.
source
.
name
),
push_screen
=
False
)
push_screen
=
False
)
ctx
.
ui
.
action
(
util
.
colorize
(
">>> "
,
'
green
'
)
+
_
(
"Unpacking archive(s)..."
))
ctx
.
ui
.
action
(
util
.
colorize
(
">>> "
,
'
purple
'
)
+
_
(
"Unpacking archive(s)..."
))
self
.
sourceArchives
.
unpack
(
self
.
pkg_work_dir
())
self
.
sourceArchives
.
unpack
(
self
.
pkg_work_dir
())
# Grab AdditionalFiles
# Grab AdditionalFiles
...
@@ -570,7 +574,7 @@ class Builder:
...
@@ -570,7 +574,7 @@ class Builder:
# Run configure, build and install phase
# Run configure, build and install phase
ctx
.
ui
.
status
(
_
(
"Building source package:
\"
{}
\"
[ SetupAction Step ]"
)
.
format
(
self
.
spec
.
source
.
name
),
ctx
.
ui
.
status
(
_
(
"Building source package:
\"
{}
\"
[ SetupAction Step ]"
)
.
format
(
self
.
spec
.
source
.
name
),
push_screen
=
False
)
push_screen
=
False
)
ctx
.
ui
.
action
(
util
.
colorize
(
">>> "
,
'
green
'
)
+
_
(
"Setting up source..."
))
ctx
.
ui
.
action
(
util
.
colorize
(
">>> "
,
'
yellow
'
)
+
_
(
"Setting up source..."
))
if
self
.
run_action_function
(
ctx
.
const
.
setup_func
):
if
self
.
run_action_function
(
ctx
.
const
.
setup_func
):
self
.
set_state
(
"setupaction"
)
self
.
set_state
(
"setupaction"
)
...
@@ -584,17 +588,14 @@ class Builder:
...
@@ -584,17 +588,14 @@ class Builder:
def
run_check_action
(
self
):
def
run_check_action
(
self
):
ctx
.
ui
.
status
(
_
(
"Building source package:
\"
{}
\"
[ CheckAction Step ]"
)
.
format
(
self
.
spec
.
source
.
name
),
ctx
.
ui
.
status
(
_
(
"Building source package:
\"
{}
\"
[ CheckAction Step ]"
)
.
format
(
self
.
spec
.
source
.
name
),
push_screen
=
False
)
push_screen
=
False
)
ctx
.
ui
.
action
(
util
.
colorize
(
">>> "
,
'
green
'
)
+
_
(
"Testing package..."
))
ctx
.
ui
.
action
(
util
.
colorize
(
">>> "
,
'
blue
'
)
+
_
(
"Testing package..."
))
self
.
run_action_function
(
ctx
.
const
.
check_func
)
self
.
run_action_function
(
ctx
.
const
.
check_func
)
def
run_install_action
(
self
):
def
run_install_action
(
self
):
ctx
.
ui
.
status
(
_
(
"Building source package:
\"
{}
\"
[ InstallAction Step ]"
)
.
format
(
self
.
spec
.
source
.
name
),
ctx
.
ui
.
status
(
_
(
"Building source package:
\"
{}
\"
[ InstallAction Step ]"
)
.
format
(
self
.
spec
.
source
.
name
),
push_screen
=
False
)
push_screen
=
False
)
ctx
.
ui
.
action
(
util
.
colorize
(
">>> "
,
'
gree
n'
)
+
_
(
"Installing..."
))
ctx
.
ui
.
action
(
util
.
colorize
(
">>> "
,
'
cya
n'
)
+
_
(
"Installing..."
))
# Before the default install make sure install_dir is clean
if
not
self
.
build_type
and
os
.
path
.
exists
(
self
.
pkg_install_dir
()):
util
.
clean_dir
(
self
.
pkg_install_dir
())
# install function is mandatory!
# install function is mandatory!
if
self
.
run_action_function
(
ctx
.
const
.
install_func
,
True
):
if
self
.
run_action_function
(
ctx
.
const
.
install_func
,
True
):
...
...
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