Skip to content

Commit a2ac975

Browse files
borsbors
committed
---
yaml --- r: 217595 b: refs/heads/tmp c: a9e26b5 h: refs/heads/master i: 217593: fc21b97 217591: f2c591c v: v3
1 parent aeddbbe commit a2ac975

File tree

219 files changed

+8609
-7863
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

219 files changed

+8609
-7863
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
2626
refs/heads/beta: 2ad26e850ed5dfedda8c96d7315aee50145ceedd
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
28-
refs/heads/tmp: c5dfd34c615b0586a101e9e66770a5c4fd31c852
28+
refs/heads/tmp: a9e26b5ced41a3b3a18036c5ba6d44d067a34057
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: a5286998df566e736b32f6795bfc3803bdaf453d
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

‎branches/tmp/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
*.exe
2020
*.fn
2121
*.html
22+
*.kdev4
2223
*.ky
2324
*.ll
2425
*.llvm

‎branches/tmp/Makefile.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
# * tidy-basic - show file / line stats
6363
# * tidy-errors - show the highest rustc error code
6464
# * tidy-features - show the status of language and lib features
65+
# * rustc-stage$(stage) - Only build up to a specific stage
6566
#
6667
# Then mix in some of these environment variables to harness the
6768
# ultimate power of The Rust Build System.
@@ -90,7 +91,7 @@
9091
#
9192
# # Rust recipes for build system success
9293
#
93-
# // Modifying libstd? Use this comment to run unit tests just on your change
94+
# // Modifying libstd? Use this command to run unit tests just on your change
9495
# make check-stage1-std NO_REBUILD=1 NO_BENCH=1
9596
#
9697
# // Added a run-pass test? Use this to test running your test

‎branches/tmp/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Rust is a fast systems programming language that guarantees
44
memory safety and offers painless concurrency ([no data races]).
55
It does not employ a garbage collector and has minimal runtime overhead.
66

7-
This repo contains the code for `rustc`, the Rust compiler, as well
7+
This repo contains the code for the compiler (`rustc`), as well
88
as standard libraries, tools and documentation for Rust.
99

1010
[no data races]: http://blog.rust-lang.org/2015/04/10/Fearless-Concurrency.html

‎branches/tmp/RELEASES.md

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
Version 1.2.0 (August 2015)
2+
===========================
3+
4+
Highlights
5+
----------
6+
7+
* [Parallel codegen][parcodegen] is now working again, which can substantially
8+
speed up large builds in debug mode; It also gets another ~33% speedup when
9+
bootstrapping on a 4 core machine (using 8 jobs). It's not enabled by default,
10+
but will be "in the near future"
11+
12+
13+
[parcodegen]: https://github.com/rust-lang/rust/pull/26018
14+
15+
116
Version 1.1.0 (June 2015)
217
=========================
318

@@ -6,29 +21,28 @@ Version 1.1.0 (June 2015)
621
Highlights
722
----------
823

9-
* The [`std::fs` module has been expanded][fs-expand] to expand the set of
24+
* The [`std::fs` module has been expanded][fs] to expand the set of
1025
functionality exposed:
1126
* `DirEntry` now supports optimizations like `file_type` and `metadata` which
1227
don't incur a syscall on some platforms.
1328
* A `symlink_metadata` function has been added.
1429
* The `fs::Metadata` structure now lowers to its OS counterpart, providing
1530
access to all underlying information.
16-
* The compiler contains extended explanations of many errors. When it
17-
emits such an error it also suggests using the `--explain` flag to
18-
read the extended explanations, which are also [cataloged on the web
19-
site][err].
31+
* The compiler now contains extended explanations of many errors. When an error
32+
with an explanation occurs the compiler suggests using the `--explain` flag
33+
to read the explanation. Error explanations are also [available online][err-index].
2034
* Thanks to multiple [improvements][sk] to [type checking][pre], as
2135
well as other work, the time to bootstrap the compiler decreased by
2236
32%.
2337

2438
Libraries
2539
---------
2640

27-
* The `str::split_whitespace` method splits a string on unicode
41+
* The [`str::split_whitespace`] method splits a string on unicode
2842
whitespace boundaries.
2943
* On both Windows and Unix, new extension traits provide conversion of
3044
I/O types to and from the underlying system handles. On Unix, these
31-
traits are [`FrowRawFd`] and [`AsRawFd`], on Windows `FromRawHandle`
45+
traits are [`FromRawFd`] and [`AsRawFd`], on Windows `FromRawHandle`
3246
and `AsRawHandle`. These are implemented for `File`, `TcpStream`,
3347
`TcpListener`, and `UpdSocket`. Further implementations for
3448
`std::process` will be stabilized later.
@@ -80,15 +94,14 @@ Misc
8094
* [The `drop_with_repr_extern` lint warns about mixing `repr(C)`
8195
with `Drop`][drop].
8296

83-
[`split_whitespace`]: http://doc.rust-lang.org/nightly/std/primitive.str.html#method.split_whitespace
84-
[`Iterator::cloned`]: http://doc.rust-lang.org/nightly/core/iter/trait.Iterator.html#method.cloned
97+
[`str::split_whitespace`]: http://doc.rust-lang.org/nightly/std/primitive.str.html#method.split_whitespace
8598
[`FromRawFd`]: http://doc.rust-lang.org/nightly/std/os/unix/io/trait.FromRawFd.html
8699
[`AsRawFd`]: http://doc.rust-lang.org/nightly/std/os/unix/io/trait.AsRawFd.html
87100
[`std::os::unix::symlink`]: http://doc.rust-lang.org/nightly/std/os/unix/fs/fn.symlink.html
88101
[`IntoIterator`]: http://doc.rust-lang.org/nightly/std/iter/trait.IntoIterator.html
89102
[`From`]: http://doc.rust-lang.org/nightly/std/convert/trait.From.html
90103
[rf]: https://github.com/rust-lang/rust/pull/24491
91-
[err]: http://doc.rust-lang.org/error-index.html
104+
[err-index]: http://doc.rust-lang.org/error-index.html
92105
[sk]: https://github.com/rust-lang/rust/pull/24615
93106
[pre]: https://github.com/rust-lang/rust/pull/25323
94107
[file]: https://github.com/rust-lang/rust/pull/24598
@@ -251,7 +264,6 @@ Misc
251264
[sw]: https://github.com/rust-lang/rfcs/blob/master/text/1054-str-words.md
252265
[th]: https://github.com/rust-lang/rfcs/blob/master/text/0909-move-thread-local-to-std-thread.md
253266
[send-rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0458-send-improvements.md
254-
[scoped]: http://static.rust-lang.org/doc/master/std/thread/fn.scoped.html
255267
[moar-ufcs]: https://github.com/rust-lang/rust/pull/22172
256268
[prim-inherent]: https://github.com/rust-lang/rust/pull/23104
257269
[overflow]: https://github.com/rust-lang/rfcs/blob/master/text/0560-integer-overflow.md
@@ -261,12 +273,10 @@ Misc
261273
[string-pattern]: https://github.com/rust-lang/rust/pull/22466
262274
[oibit-final]: https://github.com/rust-lang/rust/pull/21689
263275
[reflect]: https://github.com/rust-lang/rust/pull/23712
264-
[debug-builder]: https://github.com/rust-lang/rfcs/blob/master/text/0640-debug-improvements.md
265276
[conversion]: https://github.com/rust-lang/rfcs/pull/529
266277
[num-traits]: https://github.com/rust-lang/rust/pull/23549
267278
[index-value]: https://github.com/rust-lang/rust/pull/23601
268279
[dropck]: https://github.com/rust-lang/rfcs/pull/769
269-
[fundamental]: https://github.com/rust-lang/rfcs/pull/1023
270280
[ci-compare]: https://gist.github.com/brson/a30a77836fbec057cbee
271281
[fn-inherit]: https://github.com/rust-lang/rust/pull/23282
272282
[fn-blanket]: https://github.com/rust-lang/rust/pull/23895
@@ -369,7 +379,6 @@ Version 1.0.0-alpha.2 (February 2015)
369379
[osstr]: https://github.com/rust-lang/rust/pull/21488
370380
[osstr-rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0517-io-os-reform.md
371381
[Self]: https://github.com/rust-lang/rust/pull/22158
372-
[ufcs]: https://github.com/rust-lang/rust/pull/21077
373382
[ufcs-rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0132-ufcs.md
374383
[un]: https://github.com/rust-lang/rust/pull/22256
375384

‎branches/tmp/configure

Lines changed: 68 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -899,6 +899,18 @@ then
899899
fi
900900
fi
901901

902+
# If the clang isn't already enabled, check for GCC, and if it is missing, turn
903+
# on clang as a backup.
904+
if [ -z "$CFG_ENABLE_CLANG" ]
905+
then
906+
CFG_GCC_VERSION=$("$CFG_GCC" --version 2>&1)
907+
if [ $? -ne 0 ]
908+
then
909+
step_msg "GCC not installed, will try using Clang"
910+
CFG_ENABLE_CLANG=1
911+
fi
912+
fi
913+
902914
# Okay, at this point, we have made up our minds about whether we are
903915
# going to force CFG_ENABLE_CLANG or not; save the setting if so.
904916
if [ ! -z "$CFG_ENABLE_CLANG" ]
@@ -920,7 +932,7 @@ then
920932
LLVM_VERSION=$($LLVM_CONFIG --version)
921933

922934
case $LLVM_VERSION in
923-
(3.[5-6]*)
935+
(3.[5-7]*)
924936
msg "found ok version of LLVM: $LLVM_VERSION"
925937
;;
926938
(*)
@@ -1037,6 +1049,14 @@ for target_file in ${CFG_SRC_DIR}mk/cfg/*.mk; do
10371049
CFG_SUPPORTED_TARGET="${CFG_SUPPORTED_TARGET} $(basename "$target_file" .mk)"
10381050
done
10391051

1052+
# copy build-triples to host-triples so that builds are a subset of hosts
1053+
V_TEMP=""
1054+
for i in $CFG_BUILD $CFG_HOST;
1055+
do
1056+
echo "$V_TEMP" | grep -qF $i || V_TEMP="$V_TEMP${V_TEMP:+ }$i"
1057+
done
1058+
CFG_HOST=$V_TEMP
1059+
10401060
# copy host-triples to target-triples so that hosts are a subset of targets
10411061
V_TEMP=""
10421062
for i in $CFG_HOST $CFG_TARGET;
@@ -1094,7 +1114,7 @@ do
10941114
fi
10951115
;;
10961116

1097-
x86_64-*-msvc)
1117+
*-msvc)
10981118
# Currently the build system is not configured to build jemalloc
10991119
# with MSVC, so we omit this optional dependency.
11001120
step_msg "targeting MSVC, disabling jemalloc"
@@ -1134,22 +1154,45 @@ do
11341154
CFG_MSVC_ROOT=$(echo "$install" | grep InstallDir | sed 's/.*REG_SZ[ ]*//')
11351155
CFG_MSVC_ROOT=$(dirname "$CFG_MSVC_ROOT")
11361156
CFG_MSVC_ROOT=$(dirname "$CFG_MSVC_ROOT")
1137-
CFG_MSVC_CL="${CFG_MSVC_ROOT}/VC/bin/amd64/cl.exe"
1138-
CFG_MSVC_LIB="${CFG_MSVC_ROOT}/VC/bin/amd64/lib.exe"
1139-
CFG_MSVC_LINK="${CFG_MSVC_ROOT}/VC/bin/amd64/link.exe"
1157+
putvar CFG_MSVC_ROOT
1158+
1159+
case $i in
1160+
x86_64-*)
1161+
bits=x86_64
1162+
msvc_part=amd64
1163+
;;
1164+
i686-*)
1165+
bits=i386
1166+
msvc_part=
1167+
;;
1168+
*)
1169+
err "can only target x86 targets for MSVC"
1170+
;;
1171+
esac
1172+
bindir="${CFG_MSVC_ROOT}/VC/bin"
1173+
if [ ! -z "$msvc_part" ]; then
1174+
bindir="$bindir/$msvc_part"
1175+
fi
1176+
eval CFG_MSVC_BINDIR_$bits="\"$bindir\""
1177+
eval CFG_MSVC_CL_$bits="\"$bindir/cl.exe\""
1178+
eval CFG_MSVC_LIB_$bits="\"$bindir/lib.exe\""
1179+
eval CFG_MSVC_LINK_$bits="\"$bindir/link.exe\""
11401180

11411181
vcvarsall="${CFG_MSVC_ROOT}/VC/vcvarsall.bat"
1142-
CFG_MSVC_INCLUDE_PATH=$(cmd /c "\"$vcvarsall\" amd64 && cmd /c echo %INCLUDE%")
1182+
include_path=$(cmd /c "\"$vcvarsall\" $msvc_part && cmd /c echo %INCLUDE%")
11431183
need_ok "failed to learn about MSVC's INCLUDE"
1144-
CFG_MSVC_LIB_PATH=$(cmd /c "\"$vcvarsall\" amd64 && cmd /c echo %LIB%")
1184+
lib_path=$(cmd /c "\"$vcvarsall\" $msvc_part && cmd /c echo %LIB%")
11451185
need_ok "failed to learn about MSVC's LIB"
11461186

1147-
putvar CFG_MSVC_ROOT
1148-
putvar CFG_MSVC_CL
1149-
putvar CFG_MSVC_LIB
1150-
putvar CFG_MSVC_LINK
1151-
putvar CFG_MSVC_INCLUDE_PATH
1152-
putvar CFG_MSVC_LIB_PATH
1187+
eval CFG_MSVC_INCLUDE_PATH_${bits}="\"$include_path\""
1188+
eval CFG_MSVC_LIB_PATH_${bits}="\"$lib_path\""
1189+
1190+
putvar CFG_MSVC_BINDIR_${bits}
1191+
putvar CFG_MSVC_CL_${bits}
1192+
putvar CFG_MSVC_LIB_${bits}
1193+
putvar CFG_MSVC_LINK_${bits}
1194+
putvar CFG_MSVC_INCLUDE_PATH_${bits}
1195+
putvar CFG_MSVC_LIB_PATH_${bits}
11531196
;;
11541197

11551198
*)
@@ -1388,8 +1431,19 @@ do
13881431

13891432
msg "configuring LLVM with:"
13901433
msg "$CMAKE_ARGS"
1434+
case "$t" in
1435+
x86_64-*)
1436+
generator="Visual Studio 12 2013 Win64"
1437+
;;
1438+
i686-*)
1439+
generator="Visual Studio 12 2013"
1440+
;;
1441+
*)
1442+
err "can only build LLVM for x86 platforms"
1443+
;;
1444+
esac
13911445
(cd $LLVM_BUILD_DIR && "$CFG_CMAKE" $CFG_LLVM_SRC_DIR \
1392-
-G "Visual Studio 12 2013 Win64" \
1446+
-G "$generator" \
13931447
$CMAKE_ARGS)
13941448
need_ok "LLVM cmake configure failed"
13951449
fi

‎branches/tmp/mk/cfg/i686-pc-windows-msvc.mk

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# i686-pc-windows-msvc configuration
2+
CC_i686-pc-windows-msvc="$(CFG_MSVC_CL_i386)" -nologo
3+
LINK_i686-pc-windows-msvc="$(CFG_MSVC_LINK_i386)" -nologo
4+
CXX_i686-pc-windows-msvc="$(CFG_MSVC_CL_i386)" -nologo
5+
CPP_i686-pc-windows-msvc="$(CFG_MSVC_CL_i386)" -nologo
6+
AR_i686-pc-windows-msvc="$(CFG_MSVC_LIB_i386)" -nologo
7+
CFG_LIB_NAME_i686-pc-windows-msvc=$(1).dll
8+
CFG_STATIC_LIB_NAME_i686-pc-windows-msvc=$(1).lib
9+
CFG_LIB_GLOB_i686-pc-windows-msvc=$(1)-*.{dll,lib}
10+
CFG_LIB_DSYM_GLOB_i686-pc-windows-msvc=$(1)-*.dylib.dSYM
11+
CFG_JEMALLOC_CFLAGS_i686-pc-windows-msvc :=
12+
CFG_GCCISH_CFLAGS_i686-pc-windows-msvc := -MD
13+
CFG_GCCISH_CXXFLAGS_i686-pc-windows-msvc := -MD
14+
CFG_GCCISH_LINK_FLAGS_i686-pc-windows-msvc :=
15+
CFG_GCCISH_DEF_FLAG_i686-pc-windows-msvc :=
16+
CFG_LLC_FLAGS_i686-pc-windows-msvc :=
17+
CFG_INSTALL_NAME_i686-pc-windows-msvc =
18+
CFG_EXE_SUFFIX_i686-pc-windows-msvc := .exe
19+
CFG_WINDOWSY_i686-pc-windows-msvc := 1
20+
CFG_UNIXY_i686-pc-windows-msvc :=
21+
CFG_LDPATH_i686-pc-windows-msvc :=
22+
CFG_RUN_i686-pc-windows-msvc=$(2)
23+
CFG_RUN_TARG_i686-pc-windows-msvc=$(call CFG_RUN_i686-pc-windows-msvc,,$(2))
24+
CFG_GNU_TRIPLE_i686-pc-windows-msvc := i686-pc-win32
25+
26+
# All windows nightiles are currently a GNU triple, so this MSVC triple is not
27+
# bootstrapping from itself. This is relevant during stage0, and other parts of
28+
# the build system take this into account.
29+
BOOTSTRAP_FROM_i686-pc-windows-msvc := i686-pc-windows-gnu

‎branches/tmp/mk/cfg/x86_64-pc-windows-msvc.mk

Lines changed: 5 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# x86_64-pc-windows-msvc configuration
2-
CC_x86_64-pc-windows-msvc="$(CFG_MSVC_CL)" -nologo
3-
LINK_x86_64-pc-windows-msvc="$(CFG_MSVC_LINK)" -nologo
4-
CXX_x86_64-pc-windows-msvc="$(CFG_MSVC_CL)" -nologo
5-
CPP_x86_64-pc-windows-msvc="$(CFG_MSVC_CL)" -nologo
6-
AR_x86_64-pc-windows-msvc="$(CFG_MSVC_LIB)" -nologo
2+
CC_x86_64-pc-windows-msvc="$(CFG_MSVC_CL_x86_64)" -nologo
3+
LINK_x86_64-pc-windows-msvc="$(CFG_MSVC_LINK_x86_64)" -nologo
4+
CXX_x86_64-pc-windows-msvc="$(CFG_MSVC_CL_x86_64)" -nologo
5+
CPP_x86_64-pc-windows-msvc="$(CFG_MSVC_CL_x86_64)" -nologo
6+
AR_x86_64-pc-windows-msvc="$(CFG_MSVC_LIB_x86_64)" -nologo
77
CFG_LIB_NAME_x86_64-pc-windows-msvc=$(1).dll
88
CFG_STATIC_LIB_NAME_x86_64-pc-windows-msvc=$(1).lib
99
CFG_LIB_GLOB_x86_64-pc-windows-msvc=$(1)-*.{dll,lib}
@@ -23,64 +23,6 @@ CFG_RUN_x86_64-pc-windows-msvc=$(2)
2323
CFG_RUN_TARG_x86_64-pc-windows-msvc=$(call CFG_RUN_x86_64-pc-windows-msvc,,$(2))
2424
CFG_GNU_TRIPLE_x86_64-pc-windows-msvc := x86_64-pc-win32
2525

26-
# These two environment variables are scraped by the `./configure` script and
27-
# are necessary for `cl.exe` to find standard headers (the INCLUDE variable) and
28-
# for `link.exe` to find standard libraries (the LIB variable).
29-
ifdef CFG_MSVC_INCLUDE_PATH
30-
export INCLUDE := $(CFG_MSVC_INCLUDE_PATH)
31-
endif
32-
ifdef CFG_MSVC_LIB_PATH
33-
export LIB := $(CFG_MSVC_LIB_PATH)
34-
endif
35-
36-
# Unfortunately `link.exe` is also a program in `/usr/bin` on MinGW installs,
37-
# but it's not the one that we want. As a result we make sure that our detected
38-
# `link.exe` shows up in PATH first.
39-
ifdef CFG_MSVC_LINK
40-
export PATH := $(CFG_MSVC_ROOT)/VC/bin/amd64:$(PATH)
41-
endif
42-
43-
# There are more comments about this available in the target specification for
44-
# Windows MSVC in the compiler, but the gist of it is that we use `llvm-ar.exe`
45-
# instead of `lib.exe` for assembling archives, so we need to inject this custom
46-
# dependency here.
47-
NATIVE_TOOL_DEPS_core_T_x86_64-pc-windows-msvc += llvm-ar.exe
48-
INSTALLED_BINS_x86_64-pc-windows-msvc += llvm-ar.exe
49-
50-
# When working with MSVC on windows, each DLL needs to explicitly declare its
51-
# interface to the outside world through some means. The options for doing so
52-
# include:
53-
#
54-
# 1. A custom attribute on each function itself
55-
# 2. A linker argument saying what to export
56-
# 3. A file which lists all symbols that need to be exported
57-
#
58-
# The Rust compiler takes care (1) for us for all Rust code by annotating all
59-
# public-facing functions with dllexport, but we have a few native dependencies
60-
# which need to cross the DLL boundary. The most important of these dependencies
61-
# is LLVM which is linked into `rustc_llvm.dll` but primarily used from
62-
# `rustc_trans.dll`. This means that many of LLVM's C API functions need to be
63-
# exposed from `rustc_llvm.dll` to be forwarded over the boundary.
64-
#
65-
# Unfortunately, at this time, LLVM does not handle this sort of exportation on
66-
# Windows for us, so we're forced to do it ourselves if we want it (which seems
67-
# like the path of least resistance right now). To do this we generate a `.DEF`
68-
# file [1] which we then custom-pass to the linker when building the rustc_llvm
69-
# crate. This DEF file list all symbols that are exported from
70-
# `src/librustc_llvm/lib.rs` and is generated by a small python script.
71-
#
72-
# Fun times!
73-
#
74-
# [1]: https://msdn.microsoft.com/en-us/library/28d6s79h.aspx
75-
RUSTFLAGS_rustc_llvm_T_x86_64-pc-windows-msvc += \
76-
-C link-args="-DEF:x86_64-pc-windows-msvc/rt/rustc_llvm.def"
77-
CUSTOM_DEPS_rustc_llvm_T_x86_64-pc-windows-msvc += \
78-
x86_64-pc-windows-msvc/rt/rustc_llvm.def
79-
80-
x86_64-pc-windows-msvc/rt/rustc_llvm.def: $(S)src/etc/mklldef.py \
81-
$(S)src/librustc_llvm/lib.rs
82-
$(CFG_PYTHON) $^ $@ rustc_llvm-$(CFG_FILENAME_EXTRA)
83-
8426
# All windows nightiles are currently a GNU triple, so this MSVC triple is not
8527
# bootstrapping from itself. This is relevant during stage0, and other parts of
8628
# the build system take this into account.

‎branches/tmp/mk/main.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
######################################################################
1414

1515
# The version number
16-
CFG_RELEASE_NUM=1.2.0
16+
CFG_RELEASE_NUM=1.3.0
1717

1818
# An optional number to put after the label, e.g. '.2' -> '-beta.2'
1919
# NB Make sure it starts with a dot to conform to semver pre-release

0 commit comments

Comments
 (0)