Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
dd7a60e0
R
Rust
项目概览
int
/
Rust
11 个月 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rust
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
dd7a60e0
编写于
3月 21, 2014
作者:
B
Brian Anderson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
mk: Fix distcheck
Also, add more distcheck tests
上级
ae0e47a6
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
43 addition
and
23 deletion
+43
-23
mk/dist.mk
mk/dist.mk
+39
-21
mk/main.mk
mk/main.mk
+3
-2
src/etc/install.sh
src/etc/install.sh
+1
-0
未找到文件。
mk/dist.mk
浏览文件 @
dd7a60e0
...
...
@@ -25,7 +25,6 @@
PKG_NAME
=
$(CFG_PACKAGE_NAME)
PKG_GITMODULES
:=
$(S)
src/libuv
$(S)
src/llvm
$(S)
src/gyp
$(S)
src/compiler-rt
PKG_FILES
:=
\
$(S)
COPYRIGHT
\
$(S)
LICENSE-APACHE
\
...
...
@@ -48,8 +47,8 @@ PKG_FILES := \
snapshots.txt
\
test
)
\
$(PKG_GITMODULES)
\
$(
filter-out
Makefile config.stamp config.mk
,
\
$(MKFILE
_DEPS
)
)
$(
filter-out
config.stamp
,
\
$(MKFILE
S_FOR_TARBALL
)
)
UNROOTED_PKG_FILES
:=
$(
patsubst
$(S)
%,./%,
$(PKG_FILES)
)
...
...
@@ -83,6 +82,23 @@ $(PKG_TAR): $(PKG_FILES)
dist-tar-src
:
$(PKG_TAR)
distcheck-tar-src
:
$(PKG_TAR)
$(Q)
rm
-Rf
tmp/distcheck/
$(PKG_NAME)
$(Q)
rm
-Rf
tmp/distcheck/srccheck
$(Q)
mkdir
-p
tmp/distcheck
@
$(
call
E, unpacking
$(PKG_TAR)
in
tmp/distcheck/
$(PKG_NAME)
)
$(Q)
cd
tmp/distcheck
&&
tar
-xzf
../../
$(PKG_TAR)
@
$(
call
E, configuring
in
tmp/distcheck/srccheck
)
$(Q)
mkdir
-p
tmp/distcheck/srccheck
$(Q)
cd
tmp/distcheck/srccheck
&&
../
$(PKG_NAME)
/configure
@
$(
call
E, making
'check'
in
tmp/distcheck/srccheck
)
$(Q)
+make
-C
tmp/distcheck/srccheck check
@
$(
call
E, making
'clean'
in
tmp/distcheck/srccheck
)
$(Q)
+make
-C
tmp/distcheck/srccheck clean
$(Q)
rm
-Rf
tmp/distcheck/
$(PKG_NAME)
$(Q)
rm
-Rf
tmp/distcheck/srccheck
######################################################################
# Windows .exe installer
######################################################################
...
...
@@ -100,7 +116,7 @@ PKG_EXE = dist/$(PKG_NAME)-install.exe
cp
$<
$@
$(PKG_EXE)
:
rust.iss modpath.iss LICENSE.txt rust-logo.ico
\
$(
PKG_FILES) $(
CSREQ3_T_$(CFG_BUILD)_H_$(CFG_BUILD))
\
$(CSREQ3_T_$(CFG_BUILD)_H_$(CFG_BUILD))
\
dist-prepare-win
$(CFG_PYTHON)
$(S)
src/etc/copy-runtime-deps.py tmp/dist/win/bin
@
$(
call
E, ISCC:
$@
)
...
...
@@ -156,10 +172,6 @@ endif
# Unix binary installer tarballs
######################################################################
dist-install-dirs
:
$(foreach host
,
$(CFG_HOST)
,
dist-install-dir-$(host))
dist-tar-bins
:
$(foreach host
,
$(CFG_HOST)
,
dist/$(PKG_NAME)-$(host).tar.gz)
define
DEF_INSTALLER
dist-install-dir-$(1)
:
PREPARE_HOST=$(1)
dist-install-dir-$(1)
:
PREPARE_TARGETS=$(1)
...
...
@@ -187,6 +199,22 @@ endef
$(foreach
host,$(CFG_HOST),\
$(eval
$(call
DEF_INSTALLER,$(host))))
dist-install-dirs
:
$(foreach host
,
$(CFG_HOST)
,
dist-install-dir-$(host))
dist-tar-bins
:
$(foreach host
,
$(CFG_HOST)
,
dist/$(PKG_NAME)-$(host).tar.gz)
# Just try to run the compiler for the build host
distcheck-tar-bins
:
dist-tar-bins
@
$(
call
E, checking binary tarball
)
$(Q)
rm
-Rf
tmp/distcheck/
$(PKG_NAME)
-
$(CFG_BUILD)
$(Q)
rm
-Rf
tmp/distcheck/tarbininstall
$(Q)
mkdir
-p
tmp/distcheck
$(Q)
cd
tmp/distcheck
&&
tar
-xzf
../../dist/
$(PKG_NAME)
-
$(CFG_BUILD)
.tar.gz
$(Q)
mkdir
-p
tmp/distcheck/tarbininstall
$(Q)
sh tmp/distcheck/
$(PKG_NAME)
-
$(CFG_BUILD)
/install.sh
--prefix
=
tmp/distcheck/tarbininstall
$(Q)
tmp/distcheck/tarbininstall/bin/rustc
--version
$(Q)
rm
-Rf
tmp/distcheck/
$(PKG_NAME)
-
$(CFG_BUILD)
$(Q)
rm
-Rf
tmp/distcheck/tarbininstall
######################################################################
# Docs
...
...
@@ -208,6 +236,7 @@ ifdef CFG_WINDOWSY_$(CFG_BUILD)
dist
:
dist-win
distcheck
:
dist
$(Q)
rm
-Rf
tmp/distcheck
@
echo
@
echo
-----------------------------------------------
@
echo
Rust ready
for
distribution
(
see ./dist
)
...
...
@@ -217,19 +246,8 @@ else
dist
:
dist-tar-src
distcheck
:
$(PKG_TAR)
$(Q)
rm
-Rf
dist
$(Q)
mkdir
-p
dist
@
$(
call
E, unpacking
$(PKG_TAR)
in
dist/
$(PKG_NAME)
)
$(Q)
cd
dist
&&
tar
-xzf
../
$(PKG_TAR)
@
$(
call
E, configuring
in
dist/
$(PKG_NAME)
-build
)
$(Q)
mkdir
-p
dist/
$(PKG_NAME)
-build
$(Q)
cd
dist/
$(PKG_NAME)
-build
&&
../
$(PKG_NAME)
/configure
@
$(
call
E, making
'check'
in
dist/
$(PKG_NAME)
-build
)
$(Q)
+make
-C
dist/
$(PKG_NAME)
-build
check
@
$(
call
E, making
'clean'
in
dist/
$(PKG_NAME)
-build
)
$(Q)
+make
-C
dist/
$(PKG_NAME)
-build
clean
$(Q)
rm
-Rf
dist
distcheck
:
dist distcheck-tar-src
$(Q)
rm
-Rf
tmp/distcheck
@
echo
@
echo
-----------------------------------------------
@
echo
Rust ready
for
distribution
(
see ./dist
)
...
...
mk/main.mk
浏览文件 @
dd7a60e0
...
...
@@ -61,10 +61,11 @@ CFG_VERSION_WIN = $(CFG_RELEASE_NUM)
# and include all of the .d files in one fell swoop.
ALL_OBJ_FILES
:=
MKFILE_DEPS
:=
config.stamp
$(
call
rwildcard,
$(CFG_SRC_DIR)
mk/,
*
)
MKFILES_FOR_TARBALL
:=
$(MKFILE_DEPS)
$(info
$(MKFILES_FOR_TARBALL))
ifneq
($(NO_MKFILE_DEPS),)
MKFILE_DEPS
:=
else
MKFILE_DEPS
:=
config.stamp
$(
call
rwildcard,
$(CFG_SRC_DIR)
mk/,
*
)
endif
NON_BUILD_HOST
=
$(
filter-out
$(CFG_BUILD)
,
$(CFG_HOST)
)
NON_BUILD_TARGET
=
$(
filter-out
$(CFG_BUILD)
,
$(CFG_TARGET)
)
...
...
src/etc/install.sh
浏览文件 @
dd7a60e0
...
...
@@ -224,6 +224,7 @@ step_msg "validating $CFG_SELF args"
validate_opt
# Sanity check: can we can write to the destination?
mkdir
-p
"
${
CFG_PREFIX
}
/lib"
touch
"
${
CFG_PREFIX
}
/lib/rust-install-probe"
2> /dev/null
if
[
$?
-ne
0
]
then
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录