Skip to content

Commit

Permalink
[release] 3.2.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
pfusik committed Mar 25, 2024
1 parent c83b061 commit 6844a29
Show file tree
Hide file tree
Showing 15 changed files with 42 additions and 16 deletions.
4 changes: 2 additions & 2 deletions AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
[assembly: AssemblyProduct("Fusion Programming Language")]
[assembly: AssemblyCopyright("Copyright © Piotr Fusik 2011-2024")]
[assembly: ComVisible(false)]
[assembly: AssemblyVersion("3.1.2.0")]
[assembly: AssemblyFileVersion("3.1.2.0")]
[assembly: AssemblyVersion("3.2.0.0")]
[assembly: AssemblyFileVersion("3.2.0.0")]
2 changes: 1 addition & 1 deletion Fut.java
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ else if (arg.equals("--help")) {
return;
}
else if (arg.equals("--version")) {
System.out.println("Fusion Transpiler 3.1.2 (Java)");
System.out.println("Fusion Transpiler 3.2.0 (Java)");
return;
}
else if (arg.length() == 2 && i + 1 < args.length) {
Expand Down
17 changes: 16 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
VERSION = 3.2.0

prefix := /usr/local
bindir = $(prefix)/bin
srcdir := $(dir $(lastword $(MAKEFILE_LIST)))
Expand Down Expand Up @@ -285,11 +287,24 @@ install: fut
uninstall:
$(RM) $(DESTDIR)$(bindir)/fut

srcdist:
git archive -o ../fut-$(VERSION).tar.gz --prefix=fut-$(VERSION)/ -9 HEAD

deb64: srcdist
scp ../fut-$(VERSION).tar.gz vm:.
ssh vm 'rm -rf fut-$(VERSION) && tar xf fut-$(VERSION).tar.gz && cd fut-$(VERSION) && debuild -b -us -uc'
scp vm:fut_$(VERSION)-1_amd64.deb ..

rpm64: srcdist
scp ../fut-$(VERSION).tar.gz vm:.
ssh vm 'rpmbuild -tb fut-$(VERSION).tar.gz'
scp vm:rpmbuild/RPMS/x86_64/fut-$(VERSION)-1.x86_64.rpm ..

clean:
$(RM) fut fut.exe
$(RM) -r test/bin test/cpp test/cs test/node

.PHONY: all test test-c test-cpp test-cs test-d test-java test-js test-ts test-py test-swift test-cl test-error test-transpile coverage/output.xml coverage codecov host-diff host-diff-java install uninstall clean
.PHONY: all test test-c test-cpp test-cs test-d test-java test-js test-ts test-py test-swift test-cl test-error test-transpile coverage/output.xml coverage codecov host-diff host-diff-java install uninstall srcdist deb64 rpm64 clean

.DELETE_ON_ERROR:

Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
fut (3.2.0-1) UNRELEASED; urgency=low

* New release.

-- Piotr Fusik <[email protected]> Mon, 25 Mar 2024 12:42:21 +0100

fut (3.1.2-1) UNRELEASED; urgency=low

* New release.
Expand Down
2 changes: 1 addition & 1 deletion doc/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

The command-line transpiler `fut` runs on Windows, macOS and Linux.

Download the [release](https://github.com/fusionlanguage/fut/releases/tag/fut-3.1.2)
Download the [release](https://github.com/fusionlanguage/fut/releases/tag/fut-3.2.0)
or [build from sources](building-fut.md).

## Syntax highlighting
Expand Down
2 changes: 1 addition & 1 deletion editors/vscode/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION = 3.1.2
VERSION = 3.2.0

run: fusion-$(VERSION).vsix
'$(LOCALAPPDATA)\Programs\Microsoft VS Code\bin\code' --extensionDevelopmentPath=$(abspath .)
Expand Down
2 changes: 1 addition & 1 deletion editors/vscode/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fusion",
"version": "3.1.2",
"version": "3.2.0",
"publisher": "fusionlanguage",
"license": "MIT",
"displayName": "Fusion",
Expand Down
2 changes: 1 addition & 1 deletion fut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ int main(int argc, char **argv)
return 0;
}
else if (strcmp(arg, "--version") == 0) {
puts("Fusion Transpiler 3.1.2 (C++)");
puts("Fusion Transpiler 3.2.0 (C++)");
return 0;
}
else if (arg[1] != '\0' && arg[2] == '\0' && i + 1 < argc) {
Expand Down
2 changes: 1 addition & 1 deletion fut.cs
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ public static int Main(string[] args)
return 0;
}
else if (arg == "--version") {
Console.WriteLine("Fusion Transpiler 3.1.2 (C#)");
Console.WriteLine("Fusion Transpiler 3.2.0 (C#)");
return 0;
}
else if (arg.Length == 2 && i + 1 < args.Length) {
Expand Down
2 changes: 1 addition & 1 deletion fut.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ for (let i = 2; i < process.argv.length; i++) {
process.exit(0);
}
else if (arg == "--version") {
console.log("Fusion Transpiler 3.1.2 (Node.js)");
console.log("Fusion Transpiler 3.2.0 (Node.js)");
process.exit(0);
}
else if (i + 1 < process.argv.length) {
Expand Down
5 changes: 4 additions & 1 deletion fut.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: fut
Version: 3.1.2
Version: 3.2.0
Release: 1
Summary: Fusion Transpiler
License: GPLv3+
Expand All @@ -24,6 +24,9 @@ make DESTDIR=%{buildroot} prefix=%{_prefix} install
%{_bindir}/fut

%changelog
* Mon Mar 25 2024 Piotr Fusik <[email protected]>
- 3.2.0-1

* Mon Mar 4 2024 Piotr Fusik <[email protected]>
- 3.1.2-1

Expand Down
6 changes: 4 additions & 2 deletions hello.fu
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
public static class HelloFu
{
public const int VersionMajor = 3;
public const int VersionMinor = 1;
public const int VersionMinor = 2;
public const string Version = $"{VersionMajor}.{VersionMinor}";

/// Returns `true` if and only if `x` is a power of 2 (1, 2, 4, 8, 16, ...).
Expand Down Expand Up @@ -45,7 +45,9 @@ public static class HelloFu
}

/// Converts an unsigned integer from its decimal representation.
public static uint ParseUnsignedInt(string? s) throws Exception
public static uint ParseUnsignedInt(string? s)
/// Input is null or empty.
throws Exception
{
if (s == null || s.Length == 0)
throw Exception("Null or empty argument");
Expand Down
2 changes: 1 addition & 1 deletion test/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fut-test-ts",
"private": true,
"version": "3.1.2-development",
"version": "3.2.0-development",
"repository": "https://github.com/fusionlanguage/fut.git",
"author": "Piotr Fusik",
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion win32/setup/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION = 3.1.2
VERSION = 3.2.0
DO_SIGN = signtool sign -d "Fusion Transpiler $(VERSION)" -n "Open Source Developer, Piotr Fusik" -tr http://time.certum.pl -fd sha256 -td sha256 $^ && touch $@

signed-msi: fut-$(VERSION)-win64.msi
Expand Down
2 changes: 1 addition & 1 deletion win32/setup/fut.wxs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Package Name="Fusion Transpiler" Version="3.1.2" Manufacturer="Piotr Fusik" Language="1033" UpgradeCode="0c3e3a72-72a5-4426-a1ce-f3ebd49fc8e3">
<Package Name="Fusion Transpiler" Version="3.2.0" Manufacturer="Piotr Fusik" Language="1033" UpgradeCode="0c3e3a72-72a5-4426-a1ce-f3ebd49fc8e3">
<MajorUpgrade DowngradeErrorMessage="Newer version of Fusion Transpiler is already installed!" />
<Media Id="1" Cabinet="fut.cab" CompressionLevel="high" EmbedCab="yes" />
<StandardDirectory Id="ProgramFiles6432Folder">
Expand Down

0 comments on commit 6844a29

Please sign in to comment.