The system was upgraded and everything is back online. If you experience any issues, please send an email to atlas_admin@aei.mpg.de - thanks a lot for your patience!

Commit 9f5e9a0b authored by Rom Walton's avatar Rom Walton

VBOX/WRAPPER: Introduce versioning information to the two wrappers. It is now...

VBOX/WRAPPER: Introduce versioning information to the two wrappers.  It is now compiled into the executable instead of relying on file name.
parent ac9e2b08
......@@ -11,6 +11,12 @@ AC_CONFIG_MACRO_DIR([m4])
LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
AC_SUBST([LIBBOINC_VERSION])
WRAPPER_RELEASE=26010
AC_SUBST([WRAPPER_RELEASE])
VBOXWRAPPER_RELEASE=26079
AC_SUBST([VBOXWRAPPER_RELEASE])
AC_CANONICAL_TARGET
dnl generate .tar.gz, .tar.bz2, .zip
......
......@@ -59,6 +59,7 @@
#include <unistd.h>
#endif
#include "version.h"
#include "boinc_api.h"
#include "diagnostics.h"
#include "filesys.h"
......@@ -428,9 +429,11 @@ int main(int argc, char** argv) {
//
fprintf(
stderr,
"%s %s: starting\n",
"%s vboxwrapper (%d.%d.%d): starting\n",
vboxwrapper_msg_prefix(buf, sizeof(buf)),
argv[0]
BOINC_MAJOR_VERSION,
BOINC_MINOR_VERSION,
VBOXWRAPPER_RELEASE
);
// Log important information
......
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by boinc_ss.rc
//
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 109
#define _APS_NEXT_COMMAND_VALUE 40000
#define _APS_NEXT_CONTROL_VALUE 1010
#define _APS_NEXT_SYMED_VALUE 102
#endif
#endif
// Microsoft Visual C++ generated resource script.
//
#include "vboxwrapper_win.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "winresrc.h"
#include "version.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// Neutral resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
#ifdef _WIN32
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,VBOXWRAPPER_RELEASE,0
PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,VBOXWRAPPER_RELEASE,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x40004L
FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Space Sciences Laboratory"
VALUE "FileDescription", "BOINC VirtualBox Wrapper"
VALUE "FileVersion", BOINC_MAJOR_VERSION "." BOINC_MINOR_VERSION "." VBOXWRAPPER_RELEASE "\0"
VALUE "InternalName", "vboxwrapper"
VALUE "LegalCopyright", " 2011-2014 University of California"
VALUE "OriginalFilename", "vboxwrapper.exe"
VALUE "ProductName", "BOINC VirtualBox Wrapper"
VALUE "ProductVersion", BOINC_MAJOR_VERSION "." BOINC_MINOR_VERSION "." VBOXWRAPPER_RELEASE "\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
//
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
#endif
......@@ -52,6 +52,7 @@
#include <unistd.h>
#endif
#include "version.h"
#include "boinc_api.h"
#include "boinc_zip.h"
#include "diagnostics.h"
......@@ -993,8 +994,11 @@ int main(int argc, char** argv) {
boinc_init_options(&options);
fprintf(stderr,
"%s wrapper: starting\n",
boinc_msg_prefix(buf, sizeof(buf))
"%s wrapper (%d.%d.%d): starting\n",
boinc_msg_prefix(buf, sizeof(buf)),
BOINC_MAJOR_VERSION,
BOINC_MINOR_VERSION,
WRAPPER_RELEASE
);
boinc_get_init_data(aid);
......
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by boinc_ss.rc
//
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 109
#define _APS_NEXT_COMMAND_VALUE 40000
#define _APS_NEXT_CONTROL_VALUE 1010
#define _APS_NEXT_SYMED_VALUE 102
#endif
#endif
// Microsoft Visual C++ generated resource script.
//
#include "wrapper_win.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "winresrc.h"
#include "version.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// Neutral resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
#ifdef _WIN32
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,WRAPPER_RELEASE,0
PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,WRAPPER_RELEASE,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x40004L
FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Space Sciences Laboratory"
VALUE "FileDescription", "BOINC Wrapper"
VALUE "FileVersion", BOINC_MAJOR_VERSION "." BOINC_MINOR_VERSION "." WRAPPER_RELEASE "\0"
VALUE "InternalName", "vboxwrapper"
VALUE "LegalCopyright", " 2011-2014 University of California"
VALUE "OriginalFilename", "wrapper.exe"
VALUE "ProductName", "BOINC Wrapper"
VALUE "ProductVersion", BOINC_MAJOR_VERSION "." BOINC_MINOR_VERSION "." WRAPPER_RELEASE "\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
//
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
#endif
......@@ -12,6 +12,12 @@
/* Release part of BOINC version number */
#define BOINC_RELEASE 19
/* Release part of wrapper version number */
#define WRAPPER_RELEASE 26010
/* Release part of vboxwrapper version number */
#define VBOXWRAPPER_RELEASE 26079
/* String representation of BOINC version number */
#define BOINC_VERSION_STRING "7.3.19"
......
......@@ -12,6 +12,12 @@
/* Release part of BOINC version number */
#define BOINC_RELEASE @BOINC_RELEASE@
/* Release part of wrapper version number */
#define WRAPPER_RELEASE @WRAPPER_RELEASE@
/* Release part of vboxwrapper version number */
#define VBOXWRAPPER_RELEASE @VBOXWRAPPER_RELEASE@
/* String representation of BOINC version number */
#define BOINC_VERSION_STRING "@BOINC_VERSION_STRING@"
......
......@@ -125,10 +125,11 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>..\..\boinc_depends_win_vs2010\wxwidgets\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>libcmt.lib;libcpmt.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;wsock32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26078_windows_intelx86.exe</OutputFile>
<OutputFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26079_windows_intelx86.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
......@@ -174,10 +175,11 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>..\..\boinc_depends_win_vs2010\wxwidgets\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>libcmt.lib;libcpmt.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;wsock32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26078_windows_x86_64.exe</OutputFile>
<OutputFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26079_windows_x86_64.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
......@@ -219,6 +221,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>..\..\boinc_depends_win_vs2010\wxwidgets\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>libcmtd.lib;libcpmtd.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;psapi.lib;wsock32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
......@@ -264,6 +267,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>..\..\boinc_depends_win_vs2010\wxwidgets\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>libcmtd.lib;libcpmtd.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;wsock32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
......@@ -286,6 +290,7 @@
<ClInclude Include="..\samples\vboxwrapper\floppyio.h" />
<ClInclude Include="..\samples\vboxwrapper\vbox.h" />
<ClInclude Include="..\samples\vboxwrapper\vboxwrapper.h" />
<ClInclude Include="..\samples\vboxwrapper\vboxwrapper_win.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="libboincapi_staticcrt.vcxproj">
......@@ -297,6 +302,9 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\samples\vboxwrapper\vboxwrapper_win.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
......
......@@ -124,10 +124,11 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>..\..\boinc_depends_win_vs2010\wxwidgets\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>libcmt.lib;libcpmt.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;psapi.lib;oldnames.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>.\Build\$(Platform)\$(Configuration)\wrapper_26009_windows_intelx86.exe</OutputFile>
<OutputFile>.\Build\$(Platform)\$(Configuration)\wrapper_26010_windows_intelx86.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
......@@ -173,10 +174,11 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>..\..\boinc_depends_win_vs2010\wxwidgets\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>libcmt.lib;libcpmt.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;psapi.lib;oldnames.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>.\Build\$(Platform)\$(Configuration)\wrapper_26009_windows_x86_64.exe</OutputFile>
<OutputFile>.\Build\$(Platform)\$(Configuration)\wrapper_26010_windows_x86_64.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
......@@ -218,6 +220,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>..\..\boinc_depends_win_vs2010\wxwidgets\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>libcmtd.lib;libcpmtd.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;psapi.lib;oldnames.lib;%(AdditionalDependencies)</AdditionalDependencies>
......@@ -263,6 +266,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>..\..\boinc_depends_win_vs2010\wxwidgets\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>libcmtd.lib;libcpmtd.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;psapi.lib;oldnames.lib;%(AdditionalDependencies)</AdditionalDependencies>
......@@ -289,6 +293,7 @@
<ClInclude Include="..\samples\wrapper\regexp_custom.h" />
<ClInclude Include="..\samples\wrapper\regexp_int.h" />
<ClInclude Include="..\samples\wrapper\regmagic.h" />
<ClInclude Include="..\samples\wrapper\wrapper_win.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="libboincapi_staticcrt.vcxproj">
......@@ -304,6 +309,9 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\samples\wrapper\wrapper_win.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment