Permalink
Browse files

Added commit information.

  • Loading branch information...
1 parent b62acb4 commit c53f24998a96725eee253e8377430330736059b2 @Raptor399 Raptor399 committed Dec 31, 2011
View
@@ -2,23 +2,24 @@ Changelog:
==========
????-??-?? - 1.50.1
- Fixed DLNAResource cloning problem (#1274)
- Added renderer configuration file for Philips TV (thanks, leroy!)
- Fixed bug in RootFolder (#1243)
- Improved child discovery for the root folder
- Enhanced network interface handling (#659)
- Updated MPlayer and MEncoder revisions to SB19
- Fixed bug in Navigation Share tab
- Added Solaris specific ping command (#1277)
- Fixed problem parsing framerates with comma (#1278)
- Fixed bug in AVCHeader scanner
- Fixed broken MEncoder playback on empty custom settings
- Updated Sony Bravia EX configuration
- Fixed timeshift audio sync problem with tsMuxeR (thanks ExSport!)
- Added option to disable/enable DTS passthrough in video settings folder
- Updated Samsung AllShare configuration to recognize newest firmware
- Added support for WDHD Live and AirAv app (thanks, ehM.Deee!)
- Migrated PMS source to GitHub (https://github.com/ps3mediaserver/ps3mediaserver)
+ Fixed DLNAResource cloning problem (#1274)
+ Added renderer configuration file for Philips TV (thanks, leroy!)
+ Fixed bug in RootFolder (#1243)
+ Improved child discovery for the root folder
+ Enhanced network interface handling (#659)
+ Updated MPlayer and MEncoder revisions to SB19
+ Fixed bug in Navigation Share tab
+ Added Solaris specific ping command (#1277)
+ Fixed problem parsing framerates with comma (#1278)
+ Fixed bug in AVCHeader scanner
+ Fixed broken MEncoder playback on empty custom settings
+ Updated Sony Bravia EX configuration
+ Fixed timeshift audio sync problem with tsMuxeR (thanks ExSport!)
+ Added option to disable/enable DTS passthrough in video settings folder
+ Updated Samsung AllShare configuration to recognize newest firmware
+ Added support for WDHD Live and AirAv app (thanks, ehM.Deee!)
+ Migrated PMS source to GitHub (https://github.com/ps3mediaserver/ps3mediaserver)
+ Added commit information
2011-11-20 - 1.50.0
View
23 pom.xml
@@ -430,6 +430,29 @@
</testResources>
<plugins>
+ <!--
+ Plugin to add git commit information properties.
+ These are used in the project.properties files.
+ See: https://github.com/ktoso/maven-git-commit-id-plugin
+ -->
+ <plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ <version>1.9</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>revision</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <dateFormat>yyyy-MM-dd</dateFormat>
+ <verbose>false</verbose>
+ <generateGitPropertiesFile>false</generateGitPropertiesFile>
+ </configuration>
+ </plugin>
+
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
@@ -376,9 +376,15 @@ public void configurationChanged(ConfigurationEvent event) {
logger.info("Starting PS3 Media Server " + getVersion());
logger.info("by shagrath / 2008-2011");
logger.info("http://ps3mediaserver.org");
- logger.info("http://code.google.com/p/ps3mediaserver");
+ logger.info("https://github.com/ps3mediaserver/ps3mediaserver");
logger.info("http://ps3mediaserver.blogspot.com");
logger.info("");
+
+ String commitId = PropertiesUtil.getProjectProperties().get("git.commit.id");
+ String commitTime = PropertiesUtil.getProjectProperties().get("git.commit.time");
+ String shortCommitId = commitId.substring(0, 9);
+
+ logger.info("Build: " + shortCommitId + " (" + commitTime + ")");
logger.info("Java: " + System.getProperty("java.version") + "-" + System.getProperty("java.vendor"));
logger.info("OS: " + System.getProperty("os.name") + " " + System.getProperty("os.arch") + " " + System.getProperty("os.version"));
logger.info("Encoding: " + System.getProperty("file.encoding"));
@@ -38,6 +38,7 @@ FoldTab.33=Hide \#Transcode\# Folder
FoldTab.34=Show aperture library
FontFileFilter.3=TrueType Fonts
LinksTab.5=Helpful links:
+LinksTab.6=Build:
LooksFrame.5=Quit
LooksFrame.6=Main Panel
LooksFrame.9=Save
@@ -33,6 +33,8 @@
import net.pms.Messages;
import net.pms.PMS;
+import net.pms.util.PropertiesUtil;
+
import com.jgoodies.forms.builder.PanelBuilder;
import com.jgoodies.forms.layout.CellConstraints;
import com.jgoodies.forms.layout.FormLayout;
@@ -57,52 +59,66 @@ public ImagePanel getImagePanel() {
public JComponent build() {
FormLayout layout = new FormLayout(
"0:grow, pref, 0:grow",
- "pref, 3dlu, pref, 12dlu, pref, 3dlu, pref, 3dlu, pref, 3dlu, p, 3dlu, p, 3dlu, p");
+ "pref, 3dlu, pref, 3dlu, pref, 12dlu, pref, 3dlu, pref, 3dlu, pref, 3dlu, p, 3dlu, p, 3dlu, p");
PanelBuilder builder = new PanelBuilder(layout);
builder.setDefaultDialogBorder();
builder.setOpaque(true);
CellConstraints cc = new CellConstraints();
- final LinkMouseListener pms3Link = new LinkMouseListener("PS3 Media Server " + PMS.getVersion(),
+ String projectName = PropertiesUtil.getProjectProperties().get("project.name");
+
+ final LinkMouseListener pms3Link = new LinkMouseListener(projectName + " " + PMS.getVersion(),
"http://www.ps3mediaserver.org/");
JLabel lPms3Link = builder.addLabel(pms3Link.getLabel(), cc.xy(2, 1, "center, fill"));
lPms3Link.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
lPms3Link.addMouseListener(pms3Link);
+ // Create a build name from the available git properties
+ String commitId = PropertiesUtil.getProjectProperties().get("git.commit.id");
+ String commitTime = PropertiesUtil.getProjectProperties().get("git.commit.time");
+ String shortCommitId = commitId.substring(0, 9);
+ String commitUrl = "https://github.com/ps3mediaserver/ps3mediaserver/commit/" + commitId;
+ String buildLabel = Messages.getString("LinksTab.6") + " " + shortCommitId + " (" + commitTime + ")";
+
+ final LinkMouseListener commitLink = new LinkMouseListener(buildLabel, commitUrl);
+ JLabel lCommitLink = builder.addLabel(commitLink.getLabel(), cc.xy(2, 3, "center, fill"));
+ lCommitLink.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+ lCommitLink.addMouseListener(commitLink);
+
imagePanel = buildImagePanel();
- builder.add(imagePanel, cc.xy(2, 3, "center, fill"));
+ builder.add(imagePanel, cc.xy(2, 5, "center, fill"));
- builder.addLabel(Messages.getString("LinksTab.5"), cc.xy(2, 5, "center, fill"));
+ builder.addLabel(Messages.getString("LinksTab.5"), cc.xy(2, 7, "center, fill"));
final LinkMouseListener tsMuxerLink = new LinkMouseListener("tsMuxeR (c) Smartlabs",
"http://www.smlabs.net/en/products/tsmuxer/");
- JLabel lTsMuxerLink = builder.addLabel(tsMuxerLink.getLabel(), cc.xy(2, 7, "center, fill"));
+ JLabel lTsMuxerLink = builder.addLabel(tsMuxerLink.getLabel(), cc.xy(2, 9, "center, fill"));
lTsMuxerLink.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
lTsMuxerLink.addMouseListener(tsMuxerLink);
final LinkMouseListener ffmpegLink = new LinkMouseListener("FFmpeg",
"http://ffmpeg.mplayerhq.hu");
- JLabel lFfmpegLink = builder.addLabel(ffmpegLink.getLabel(), cc.xy(2, 9, "center, fill"));
+ JLabel lFfmpegLink = builder.addLabel(ffmpegLink.getLabel(), cc.xy(2, 11, "center, fill"));
lFfmpegLink.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
lFfmpegLink.addMouseListener(ffmpegLink);
final LinkMouseListener mplayerLink = new LinkMouseListener("MPlayer",
"http://www.mplayerhq.hu");
- JLabel lMplayerLink = builder.addLabel(mplayerLink.getLabel(), cc.xy(2, 11, "center, fill"));
+ JLabel lMplayerLink = builder.addLabel(mplayerLink.getLabel(), cc.xy(2, 13, "center, fill"));
lMplayerLink.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
lMplayerLink.addMouseListener(mplayerLink);
final LinkMouseListener mplayerSherpiaBuildsLink = new LinkMouseListener("MPlayer's Sherpya Builds",
"http://oss.netfarm.it/mplayer-win32.php");
- JLabel lMplayerSherpiaBuildsLink = builder.addLabel(mplayerSherpiaBuildsLink.getLabel(), cc.xy(2, 13, "center, fill"));
+ JLabel lMplayerSherpiaBuildsLink = builder.addLabel(mplayerSherpiaBuildsLink.getLabel(), cc.xy(2, 15, "center, fill"));
lMplayerSherpiaBuildsLink.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
lMplayerSherpiaBuildsLink.addMouseListener(mplayerSherpiaBuildsLink);
final LinkMouseListener imageMagickLink = new LinkMouseListener("ImageMagick",
"http://www.imagemagick.org");
- JLabel lImageMagickLink = builder.addLabel(imageMagickLink.getLabel(), cc.xy(2, 15, "center, fill"));
+ JLabel lImageMagickLink = builder.addLabel(imageMagickLink.getLabel(), cc.xy(2, 17, "center, fill"));
lImageMagickLink.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
lImageMagickLink.addMouseListener(imageMagickLink);
@@ -6,3 +6,7 @@ project.renderers.dir=renderers, src/main/external-resources/renderers
project.binaries.dir=
project.logback=logback.xml
project.logback.headless=logback.headless.xml
+
+# Git commit information from the git-commit-id-plugin
+git.commit.id=${git.commit.id}
+git.commit.time=${git.commit.time}
@@ -5,3 +5,7 @@ project.renderers.dir=src/main/external-resources/renderers
project.binaries=${project.binaries}
project.logback=src/main/external-resources/logback.xml
project.logback.headless=src/main/external-resources/logback.headless.xml
+
+# Git commit information from the git-commit-id-plugin
+git.commit.id=${git.commit.id}
+git.commit.time=${git.commit.time}

0 comments on commit c53f249

Please sign in to comment.