Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Build and Package bscan also for windows
  • Loading branch information
pstorz authored and Marco van Wieringen committed May 21, 2015
1 parent 7f64530 commit 37b9113
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 1 deletion.
1 change: 1 addition & 0 deletions platforms/win32/winbareos-nsi.spec
Expand Up @@ -139,6 +139,7 @@ do
btape.exe \
bls.exe \
bextract.exe \
bscan.exe \
bareos-tray-monitor.exe \
bat.exe \
bpipe-fd.dll \
Expand Down
2 changes: 2 additions & 0 deletions platforms/win32/winbareos.nsi
Expand Up @@ -593,6 +593,7 @@ SectionIn 2
File "btape.exe"
File "bls.exe"
File "bextract.exe"
File "bscan.exe"

CreateDirectory "C:\bareos-storage"

Expand Down Expand Up @@ -1701,6 +1702,7 @@ ConfDeleteSkip:
Delete "$INSTDIR\btape.exe"
Delete "$INSTDIR\bls.exe"
Delete "$INSTDIR\bextract.exe"
Delete "$INSTDIR\bscan.exe"
Delete "$INSTDIR\bconsole.exe"
Delete "$INSTDIR\Plugins\bpipe-fd.dll"
Delete "$INSTDIR\Plugins\mssqlvdi-fd.dll"
Expand Down
1 change: 1 addition & 0 deletions platforms/win32/winbareos32.spec
Expand Up @@ -194,6 +194,7 @@ for flavor in `echo "%flavors"`; do
stored/btape.exe \
stored/bls.exe \
stored/bextract.exe \
stored/bscan.exe \
dird/bareos-dir.exe \
dird/bareos-dbcheck.exe \
tools/bsmtp.exe \
Expand Down
1 change: 1 addition & 0 deletions platforms/win32/winbareos64.spec
Expand Up @@ -194,6 +194,7 @@ for flavor in `echo "%flavors"`; do
stored/btape.exe \
stored/bls.exe \
stored/bextract.exe \
stored/bscan.exe \
dird/bareos-dir.exe \
dird/bareos-dbcheck.exe \
tools/bsmtp.exe \
Expand Down
5 changes: 5 additions & 0 deletions src/win32/Makefile
Expand Up @@ -62,6 +62,7 @@ rc-files: tools/bsmtpres.rc \
stored/storedres.rc \
stored/bextractres.rc \
stored/blsres.rc \
stored/bscanres.rc \
stored/btaperes.rc \
dird/dirdres.rc \
dird/dbcheckres.rc
Expand All @@ -74,6 +75,7 @@ rc-files: tools/bsmtpres.rc \
stored/storedres.rc \
stored/bextractres.rc \
stored/blsres.rc \
stored/bscanres.rc \
stored/btaperes.rc \
dird/dirdres.rc \
dird/dbcheckres.rc \
Expand Down Expand Up @@ -121,3 +123,6 @@ stored/btaperes.rc: stored/btaperes.rc.in

stored/blsres.rc: stored/blsres.rc.in
@sed -e 's/@VERSION@/$(VERSION_STRING)/' $< > $@

stored/bscanres.rc: stored/bscanres.rc.in
@sed -e 's/@VERSION@/$(VERSION_STRING)/' $< > $@
12 changes: 11 additions & 1 deletion src/win32/stored/Makefile
Expand Up @@ -66,9 +66,15 @@ BLSOBJS = $(BLSSRCS:.c=.o)
BEXTSRCS = bextract.c
BEXTOBJS = $(BEXTSRCS:.c=.o)

BSCANSRCS = bscan.c
BSCANOBJS = $(BSCANSRCS:.c=.o)

WINDRESSRCS = storedres.rc
WINDRESOBJS = $(WINDRESSRCS:.rc=.o)

BSCANRESSRCS = bscanres.rc
BSCANRESOBJS = $(BSCANRESSRCS:.rc=.o)

BLSRESSRCS = blsres.rc
BLSRESOBJS = $(BLSRESSRCS:.rc=.o)

Expand All @@ -78,7 +84,7 @@ BTAPERESOBJS = $(BTAPERESSRCS:.rc=.o)
BEXTRACTRESSRCS = bextractres.rc
BEXTRACTRESOBJS = $(BEXTRACTRESSRCS:.rc=.o)

all: libbareossd.dll bareos-sd.exe btape.exe bls.exe bextract.exe
all: libbareossd.dll bareos-sd.exe btape.exe bls.exe bextract.exe bscan.exe

bareos$(WIN_VERSION).def: $(DYNAMIC_OBJS) make_def
./make_def $(WIN_VERSION) $(DYNAMIC_OBJS) > $@
Expand All @@ -104,6 +110,10 @@ bextract.exe: DLL_USAGE = -DUSING_DLL
bextract.exe: libbareossd.dll $(BEXTOBJS) $(BEXTRACTRESOBJS)
$(CXX) $(LDFLAGS_CONS) $(BEXTOBJS) $(BEXTRACTRESOBJS) $(LDLIBS_FIND) ./libbareossd.dll -o $@

bscan.exe: DLL_USAGE = -DUSING_DLL
bscan.exe: libbareossd.dll $(BSCANOBJS) $(BSCANRESOBJS)
$(CXX) $(LDFLAGS_CONS) $(BSCANOBJS) $(BSCANRESOBJS) $(LDLIBS_FIND) ../cats/libbareoscats.dll ./libbareossd.dll -o $@

clean:
rm -f *.o bareos$(WIN_VERSION).def

Expand Down
31 changes: 31 additions & 0 deletions src/win32/stored/bscanres.rc.in
@@ -0,0 +1,31 @@
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", "bscan utility"
VALUE "FileVersion", @VERSION@
VALUE "InternalName", "bscan.exe"
VALUE "OriginalFilename", "bscan.exe"
VALUE "ProductName", "Bareos Storage Daemon"
VALUE "ProductVersion", @VERSION@
VALUE "LegalCopyright", "Copyright 2000-2012 Free Software Foundation Europe e.V. "
"Copyright 2015-2015 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

0 comments on commit 37b9113

Please sign in to comment.