New individual Icons for windows binaries

bareos · Dec 11, 2014 · 908085c · 908085c
1 parent b459035
commit 908085c
Show file tree

Hide file tree

Showing 20 changed files with 131 additions and 14 deletions.
diff --git a/platforms/win32/bareosdir.ico b/platforms/win32/bareosdir.ico
diff --git a/platforms/win32/bareosfd.ico b/platforms/win32/bareosfd.ico
diff --git a/platforms/win32/bareossd.ico b/platforms/win32/bareossd.ico
diff --git a/platforms/win32/bareostools.ico b/platforms/win32/bareostools.ico
diff --git a/platforms/win32/bconsole.ico b/platforms/win32/bconsole.ico
diff --git a/platforms/win32/bsmtp.ico b/platforms/win32/bsmtp.ico
diff --git a/platforms/win32/traymon.ico b/platforms/win32/traymon.ico
diff --git a/src/win32/Makefile b/src/win32/Makefile
@@ -69,6 +69,9 @@ rc-files: tools/bsmtpres.rc \
 	  console/consoleres.rc \
 	  filed/filedres.rc \
 	  stored/storedres.rc \
+	  stored/bextractres.rc \
+	  stored/blsres.rc \
+	  stored/btaperes.rc \
 	  dird/dirdres.rc \
 	  dird/dbcheckres.rc \
 	  qt-console/batres.rc \
@@ -106,3 +109,12 @@ dird/dirdres.rc: dird/dirdres.rc.in
 
 dird/dbcheckres.rc: dird/dbcheckres.rc.in
 	@sed -e 's/@VERSION@/$(VERSION_STRING)/' $< > $@
+
+stored/bextractres.rc: stored/bextractres.rc.in
+	@sed -e 's/@VERSION@/$(VERSION_STRING)/' $< > $@
+
+stored/btaperes.rc: stored/btaperes.rc.in
+	@sed -e 's/@VERSION@/$(VERSION_STRING)/' $< > $@
+
+stored/blsres.rc: stored/blsres.rc.in
+	@sed -e 's/@VERSION@/$(VERSION_STRING)/' $< > $@
diff --git a/src/win32/console/consoleres.rc.in b/src/win32/console/consoleres.rc.in
@@ -1,4 +1,4 @@
-id ICON "../../../platforms/win32/bareos.ico"
+id ICON "../../../platforms/win32/bconsole.ico"
 1 VERSIONINFO
 FILEVERSION     1,0,0,0
 PRODUCTVERSION  1,0,0,0

diff --git a/src/win32/dird/Makefile b/src/win32/dird/Makefile
@@ -62,7 +62,7 @@ bareos-dir.exe: $(SVROBJS) $(WINDRESOBJS)
 
 dbcheck.exe: DLL_USAGE = -DUSING_DLL
 dbcheck.exe: $(DBCHKOBJS) $(DBCHKRESOBJS)
-	$(CXX) $(LDFLAGS_CONS) $(DBCHKOBJS) $(LDLIBS) $(WINDRESOBJS) -o $@
+	$(CXX) $(LDFLAGS_CONS) $(DBCHKOBJS) $(LDLIBS) $(DBCHKRESOBJS) -o $@
 
 clean:
 	rm -f *.o

diff --git a/src/win32/dird/dbcheckres.rc.in b/src/win32/dird/dbcheckres.rc.in
@@ -1,4 +1,4 @@
-id ICON "../../../platforms/win32/bareos.ico"
+id ICON "../../../platforms/win32/bareostools.ico"
 1 VERSIONINFO
 FILEVERSION     1,0,0,0
 PRODUCTVERSION  1,0,0,0

diff --git a/src/win32/dird/dirdres.rc.in b/src/win32/dird/dirdres.rc.in
@@ -1,4 +1,4 @@
-id ICON "../../../platforms/win32/bareos.ico"
+id ICON "../../../platforms/win32/bareosdir.ico"
 1 VERSIONINFO
 FILEVERSION     1,0,0,0
 PRODUCTVERSION  1,0,0,0

diff --git a/src/win32/filed/filedres.rc.in b/src/win32/filed/filedres.rc.in
@@ -1,4 +1,4 @@
-id ICON "../../../platforms/win32/bareos.ico"
+id ICON "../../../platforms/win32/bareosfd.ico"
 1 VERSIONINFO
 FILEVERSION     1,0,0,0
 PRODUCTVERSION  1,0,0,0

diff --git a/src/win32/qt-tray-monitor/traymon.rc.in b/src/win32/qt-tray-monitor/traymon.rc.in
@@ -1,4 +1,4 @@
-id ICON "../../../platforms/win32/bareos.ico"
+id ICON "../../../platforms/win32/traymon.ico"
 1 VERSIONINFO
 FILEVERSION     1,0,0,0
 PRODUCTVERSION  1,0,0,0

diff --git a/src/win32/stored/Makefile b/src/win32/stored/Makefile
@@ -69,6 +69,15 @@ BEXTOBJS = $(BEXTSRCS:.c=.o)
 WINDRESSRCS = storedres.rc
 WINDRESOBJS = $(WINDRESSRCS:.rc=.o)
 
+BLSRESSRCS = blsres.rc
+BLSRESOBJS = $(BLSRESSRCS:.rc=.o)
+
+BTAPERESSRCS = btaperes.rc
+BTAPERESOBJS = $(BTAPERESSRCS:.rc=.o)
+
+BEXTRACTRESSRCS = bextractres.rc
+BEXTRACTRESOBJS = $(BEXTRACTRESSRCS:.rc=.o)
+
 all: libbareossd.dll bareos-sd.exe btape.exe bls.exe bextract.exe
 
 bareos$(WIN_VERSION).def: $(DYNAMIC_OBJS) make_def
@@ -84,16 +93,16 @@ bareos-sd.exe: libbareossd.dll $(SVROBJS) $(WINDRESOBJS)
 	$(CXX) $(LDFLAGS_WINAPP) $(SVROBJS) $(WINDRESOBJS) $(LDLIBS) ./libbareossd.dll -o $@
 
 btape.exe: DLL_USAGE = -DUSING_DLL
-btape.exe: libbareossd.dll $(TAPEOBJS) $(WINDRESOBJS)
-	$(CXX) $(LDFLAGS_CONS) $(TAPEOBJS) $(WINDRESOBJS) $(LDLIBS) ./libbareossd.dll -o $@
+btape.exe: libbareossd.dll $(TAPEOBJS) $(BTAPERESOBJS)
+	$(CXX) $(LDFLAGS_CONS) $(TAPEOBJS) $(BTAPERESOBJS) $(LDLIBS) ./libbareossd.dll -o $@
 
 bls.exe: DLL_USAGE = -DUSING_DLL
-bls.exe: libbareossd.dll $(BLSOBJS) $(WINDRESOBJS)
-	$(CXX) $(LDFLAGS_CONS) $(BLSOBJS) $(WINDRESOBJS) $(LDLIBS_FIND) ./libbareossd.dll -o $@
+bls.exe: libbareossd.dll $(BLSOBJS) $(BLSRESOBJS)
+	$(CXX) $(LDFLAGS_CONS) $(BLSOBJS) $(BLSRESOBJS) $(LDLIBS_FIND) ./libbareossd.dll -o $@
 
 bextract.exe: DLL_USAGE = -DUSING_DLL
-bextract.exe: libbareossd.dll $(BEXTOBJS) $(WINDRESOBJS)
-	$(CXX) $(LDFLAGS_CONS) $(BEXTOBJS) $(WINDRESOBJS) $(LDLIBS_FIND) ./libbareossd.dll -o $@
+bextract.exe: libbareossd.dll $(BEXTOBJS) $(BEXTRACTRESOBJS)
+	$(CXX) $(LDFLAGS_CONS) $(BEXTOBJS) $(BEXTRACTRESOBJS) $(LDLIBS_FIND) ./libbareossd.dll -o $@
 
 clean:
 	rm -f *.o bareos$(WIN_VERSION).def

diff --git a/src/win32/stored/bextractres.rc.in b/src/win32/stored/bextractres.rc.in
@@ -0,0 +1,32 @@
+id ICON "../../../platforms/win32/bareostools.ico"
+1 VERSIONINFO
+FILEVERSION     1,0,0,0
+PRODUCTVERSION  1,0,0,0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "080904E4"
+    BEGIN
+      VALUE "CompanyName", "Bareos GmbH & Co. KG"
+      VALUE "FileDescription", "bextract utility"
+      VALUE "FileVersion", @VERSION@
+      VALUE "InternalName", "bextract.exe"
+      VALUE "OriginalFilename", "bextract.exe"
+      VALUE "ProductName", "Bareos Storage Daemon"
+      VALUE "ProductVersion", @VERSION@
+      VALUE "LegalCopyright", "Copyright 2000-2012 Free Software Foundation Europe e.V. "
+                              "Copyright 2013-2013 Bareos GmbH & Co. KG "
+      VALUE "LegalTrademarks", "Licensed under GNU AGPLv3."
+                               "This program is distributed in the hope that it will be useful, "
+                               "but WITHOUT ANY WARRANTY; without even the implied warranty of "
+                               "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the "
+                               "GNU Affero General Public License for more details.  "
+    END
+  END
+
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x809, 1252
+  END
+END
+
diff --git a/src/win32/stored/blsres.rc.in b/src/win32/stored/blsres.rc.in
@@ -0,0 +1,32 @@
+id ICON "../../../platforms/win32/bareostools.ico"
+1 VERSIONINFO
+FILEVERSION     1,0,0,0
+PRODUCTVERSION  1,0,0,0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "080904E4"
+    BEGIN
+      VALUE "CompanyName", "Bareos GmbH & Co. KG"
+      VALUE "FileDescription", "bls utility"
+      VALUE "FileVersion", @VERSION@
+      VALUE "InternalName", "bls.exe"
+      VALUE "OriginalFilename", "bls.exe"
+      VALUE "ProductName", "Bareos Storage Daemon"
+      VALUE "ProductVersion", @VERSION@
+      VALUE "LegalCopyright", "Copyright 2000-2012 Free Software Foundation Europe e.V. "
+                              "Copyright 2013-2013 Bareos GmbH & Co. KG "
+      VALUE "LegalTrademarks", "Licensed under GNU AGPLv3."
+                               "This program is distributed in the hope that it will be useful, "
+                               "but WITHOUT ANY WARRANTY; without even the implied warranty of "
+                               "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the "
+                               "GNU Affero General Public License for more details.  "
+    END
+  END
+
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x809, 1252
+  END
+END
+
diff --git a/src/win32/stored/btaperes.rc.in b/src/win32/stored/btaperes.rc.in
@@ -0,0 +1,32 @@
+id ICON "../../../platforms/win32/bareostools.ico"
+1 VERSIONINFO
+FILEVERSION     1,0,0,0
+PRODUCTVERSION  1,0,0,0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "080904E4"
+    BEGIN
+      VALUE "CompanyName", "Bareos GmbH & Co. KG"
+      VALUE "FileDescription", "btape utility"
+      VALUE "FileVersion", @VERSION@
+      VALUE "InternalName", "btape.exe"
+      VALUE "OriginalFilename", "btape.exe"
+      VALUE "ProductName", "Bareos Storage Daemon"
+      VALUE "ProductVersion", @VERSION@
+      VALUE "LegalCopyright", "Copyright 2000-2012 Free Software Foundation Europe e.V. "
+                              "Copyright 2013-2013 Bareos GmbH & Co. KG "
+      VALUE "LegalTrademarks", "Licensed under GNU AGPLv3."
+                               "This program is distributed in the hope that it will be useful, "
+                               "but WITHOUT ANY WARRANTY; without even the implied warranty of "
+                               "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the "
+                               "GNU Affero General Public License for more details.  "
+    END
+  END
+
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x809, 1252
+  END
+END
+
diff --git a/src/win32/stored/storedres.rc.in b/src/win32/stored/storedres.rc.in
@@ -1,4 +1,4 @@
-id ICON "../../../platforms/win32/bareos.ico"
+id ICON "../../../platforms/win32/bareossd.ico"
 1 VERSIONINFO
 FILEVERSION     1,0,0,0
 PRODUCTVERSION  1,0,0,0

diff --git a/src/win32/tools/bsmtpres.rc.in b/src/win32/tools/bsmtpres.rc.in
@@ -1,4 +1,4 @@
-id ICON "../../../platforms/win32/bareos.ico"
+id ICON "../../../platforms/win32/bsmtp.ico"
 1 VERSIONINFO
 FILEVERSION     1,0,0,0
 PRODUCTVERSION  1,0,0,0