Skip to content

Commit

Permalink
Added missing GUID for Greenfoot 3.8.1, and now committing results of…
Browse files Browse the repository at this point in the history
… updateVersionNumber task.
  • Loading branch information
neilccbrown committed Oct 19, 2023
1 parent 9508588 commit 7cda778
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion bluej/package/winlaunch/gfmanifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<!-- Note: the following line is matched by a regex in the build file -->
<assemblyIdentity version="3.8.0.0"
<assemblyIdentity version="3.8.1.0"
processorArchitecture="X86"
name="Greenfoot"
type="win32"/>
Expand Down
8 changes: 4 additions & 4 deletions bluej/package/winlaunch/greenfoot-version.rc
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
FILEVERSION 3,8,0,0
PRODUCTVERSION 3,8,0,0
FILEVERSION 3,8,1,0
PRODUCTVERSION 3,8,1,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "04091200"
BEGIN
VALUE "CompanyName", "BlueJ group"
VALUE "FileDescription", "Greenfoot Launcher"
VALUE "FileVersion", "3.8.0"
VALUE "FileVersion", "3.8.1"
VALUE "InternalName", "greenfoot"
VALUE "OriginalFilename", "greenfoot.exe"
VALUE "ProductName", "Greenfoot"
VALUE "ProductVersion", "3.8.0"
VALUE "ProductVersion", "3.8.1"
END
END
END
4 changes: 2 additions & 2 deletions bluej/package/winsetup/greenfoot.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
If you get a build failure here with a message about ${greenfoot-3.1.0} or similar not being a legal
guid value, then it is because you failed to make a new GUID for this version: see the
update-version-number task in ant for details on what to do. -->
<Product Version='3.8.0' Id='41ad39a1-7328-454a-847b-814b0d008df0'
<Product Version='3.8.1' Id='e9f90c70-f233-4193-b697-6830fc31fcbd'
Name='Greenfoot' UpgradeCode='3ec7b829-9e53-4132-b2bf-fb7d4c08aebc'
Language='1033' Codepage='1252' Manufacturer='Greenfoot Team'>

Expand All @@ -23,7 +23,7 @@
<Property Id="ALLUSERS" Secure="yes" />

<Property Id="SOFTWARE" Value="Greenfoot"/>
<Property Id="SOFTWAREVERSION" Value="3.8.0"/>
<Property Id="SOFTWAREVERSION" Value="3.8.1"/>
<Property Id="SOFTWAREPROJECTEXT" Value="greenfoot"/>
<Property Id="SOFTWAREARCHIVEEXT" Value="gfar"/>
<!-- Define all the necessary GUIDs here, to make sure they are different from BlueJ -->
Expand Down
4 changes: 2 additions & 2 deletions boot/src/main/java/bluej/Boot.java
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ public class Boot
// version.properties file and then the :boot:updateVersionNumber task should be
// executed to change them here and elsewhere where needed.
public static final String BLUEJ_VERSION = "5.2.1";
public static final String GREENFOOT_VERSION = "3.8.0";
public static final String GREENFOOT_API_VERSION = "3.0.0";
public static final String GREENFOOT_VERSION = "3.8.1";
public static final String GREENFOOT_API_VERSION = "3.1.0";

public static final String BLUEJ_VERSION_TITLE = "BlueJ " + BLUEJ_VERSION;

Expand Down
2 changes: 1 addition & 1 deletion greenfoot/doc/Greenfoot-README.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Greenfoot version: 3.8.0
Greenfoot version: 3.8.1

Information about Greenfoot
-----------------------
Expand Down
1 change: 1 addition & 0 deletions version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,4 @@ greenfoot-3.6.1=ce3160a8-9e99-48a9-99fc-96796e162635
greenfoot-3.7.0=c835680c-c79d-4285-9107-7f25cab1bbcd
greenfoot-3.7.1=54bbe388-bd06-4007-8da6-2da5dbdf2174
greenfoot-3.8.0=41ad39a1-7328-454a-847b-814b0d008df0
greenfoot-3.8.1=e9f90c70-f233-4193-b697-6830fc31fcbd

0 comments on commit 7cda778

Please sign in to comment.