Rudif
13th August 2006 19:05 UTC

port NSIS to VC8 and to x64 ?
Hello all
We are using NSIS to build Win32 installers for SW developed under VC8. So far, we use the prebuilt NSIS binaries.
Since NSIS binaries that would run on x64 do not seem to exist, I would like to port them.
This would be a two-step process
- adapt the NSIS sources and SCons scripts to build Win32 binaries with VC8
- add the x64 configurations and build them
The SCons 0.96.1 official release does not support VC8,
but the 0.96.92 testing pre-release does.

I tried to build NSIS from 2.19 sources, using SCons 0.96.92, and I ran into a build problem diagnosed as
"scons: *** An executable should have exactly one target with the suffix: .exe
File "SConstruct", line 502, in BuildUtil".

So, is there anyone experienced in SCons and in building NSIS on Windows, who would like to team up with me and help with this port?
I am willing to experiment and learn, but teamwork would make it go faster and more fun.

Rudif

kichik
18th August 2006 12:13 UTC

The sconscripts need a bit of updating for 0.96.92, mainly for the problem you've encountered. Instead of directly building the utilities with their names, it should build it with whatever name scons wants and only install it with the name we need.

If I remember correctly, mingw.py also needs a few updates for 0.96.92.

Attached is the SConstruct file I updated for 0.06.92, but never got to finish. It kind of works now, I think. It was built on an older version of SConstruct, but I merged the new changes from NSIS 2.19.

BTW, even if you get it to build, there's still some work to be done for 64-bit installers. The installer stubs need some work for word-size neutrality and the compiler itself needs to write some headers with 64-bit integers. The compiler side already has an infrastructure for that using the writers introduced in 2.16 for big-endian support. However, there are no readers yet which are required to get the resource and dialog editor to work with both 32-bit and 64-bit resources.

For a simpler beginning and maybe a proof of concept, you can create two makensis builds, one for 32-bit installers and one for 64-bit installers.

Needless to say, any patch in this topic, including scons 0.96.92 support, will be happily accepted.

Rudif
19th August 2006 18:36 UTC

Hi Kichik

Thank you for the updated SConstruct. I made some progress using it.
I am learning basic python, scons and nsis build tricks, as I go along.

If I remember correctly, mingw.py also needs a few updates for 0.96.92.

there's still some work to be done for 64-bit installers.

    scons: Building targets ...
    cl /nologo /O1 /W3 /c Contrib\AdvSplash\advsplash.c /Fobuild\release\AdvSplash\advsplash.obj
    advsplash.c
    link /nologo /opt:nowin98 /map /entry:DllMain /NODEFAULTLIB /dll /out:build\release\AdvSplash\AdvSplash.dll kernel32.lib
     user32.lib gdi32.lib winmm.lib build\release\AdvSplash\advsplash.obj
       Creating library build\release\AdvSplash\AdvSplash.lib and object build\release\AdvSplash\AdvSplash.exp
    advsplash.obj : error LNK2019: unresolved external symbol ___security_cookie referenced in function _WndProc@16
    advsplash.obj : error LNK2019: unresolved external symbol @__security_check_cookie@4 referenced in function _WndProc@16
    build\release\AdvSplash\AdvSplash.dll : fatal error LNK1120: 2 unresolved externals
    scons: *** [build\release\AdvSplash\AdvSplash.dll] Error 1120
    scons: building terminated because of errors.

Visual C++ Compiler Options
/GS (Buffer Security Check)

Detects some buffer overruns that overwrite the return address, a common technique for exploiting code
that does not enforce buffer size restrictions. This is achieved by injecting security checks into the compiled code.

/GS[-]

Remarks

/GS is on by default. Use /GS- if you expect your application to have no security exposure.

    defenv = Environment()
    defenv.Append(CCFLAGS = ' /GS-')

    ...
    Created h:\mauisoft\main\Sandbox\3rdparty\nsis-2.19-src\build\release\Docs\chm\NSIS.chm, 297,390 bytes
    Compression decreased file by 618,934 bytes.
    link /nologo /opt:nowin98 /map /entry:DllMain /NODEFAULTLIB /dll /out:build\release\InstallOptions\InstallOptions.dll 
    kernel32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib 
    build\release\InstallOptions\InstallerOptions.obj build\release \InstallOptions\ioptdll.res
       Creating library build\release\InstallOptions\InstallOptions.lib and object build\release\InstallOptions\InstallOptio
    ns.exp
    InstallerOptions.obj : error LNK2019: unresolved external symbol _memset referenced in function "long __stdcall 
    WMCommandProc(struct HWND__ *,unsigned int,struct HWND__ *,unsigned int)" (?WMCommandProc@@YGJPAUHWND__@@I0I@Z)
    build\release\InstallOptions\InstallOptions.dll : fatal error LNK1120: 1 unresolved externals
    scons: *** [build\release\InstallOptions\InstallOptions.dll] Error 1120
    scons: building terminated because of errors.
    ...

kichik
19th August 2006 18:46 UTC

• System is quite problematic when it comes to portability. It won't build on anything but MSVC and as a 32-bit target. Sadly, the assembly and the naked functions are required in there for the callbacks and the runtime "compilation".
• Using defenv.Append is indeed the way to add flags, but it should be done in the msvc specific code under SCons\Config\ms.
• _memset is indeed missing because of /NODEFAULTLIB. The new compiler probably uses it under the hood for something. Maybe it's for inline initialization of arrays, in which case, the exact code from SCons\Config\gnu can be used. For a quick fix, you can add SCons\Config\memset.c as a source code file for InstallOptions.
• To change linker options, append to LINKFLAGS instead of CCFLAGS.

Rudif
20th August 2006 19:42 UTC

Kichik,


>> System is quite problematic when it comes to portability. It won't build on anything but MSVC and as a 32-bit target.

Sure. For now, my objective is to build NSIS with VC8 (using scons), so I will leave the 64-bit problems for later.


>> Using defenv.Append is indeed the way to add flags, but it should be done in the msvc specific code under SCons\Config\ms.

OK, makes sense. I moved my line

defenv.Append(CCFLAGS = ' /GS-')

from SConstruct to SCons\Config\ms, at the end of ### flags section.

It works as expected (suppresses the link problem with 2 missing symbols).




>> For a quick fix, you can add SCons\Config\memset.c as a source code file for InstallOptions.


I added to sconscripts for InstallerOptions, LangDLL and RegTool at : files = Split("""...

#SCons\Config\memset.c

This solved the linker error with missing memset.


Now the build is stopping here


link /nologo /opt:nowin98 /map /entry:DllMain /dll /out:build\release\Math\Math.dll kernel32.lib build\release\Math\Sour
ce\Math.obj build\release\Math\Source\MyMath.obj build\release\Math\Source\plugin.obj Contrib\Math\Source\mathcrt.lib
LIBCMT.lib(ftol2.obj) : error LNK2005: __ftol2 already defined in mathcrt.lib(ftol2.obj)
LINK : fatal error LNK1104: cannot open file 'LIBC.lib'
scons: *** [build\release\Math\Math.dll] Error 1104
scons: building terminated because of errors.


MSDN says this

"
The single-threaded CRT libraries, libc.lib and libcd.lib, have been removed. Use the multi-threaded CRT libraries.
The /ML compiler flag is no longer supported. Non-locking versions of some functions have been added in cases where
the performance difference between the multithreaded code and the single-threaded code is potentially significant.
"


Can you clarify something for me : above link is using Contrib\Math\Source\mathcrt.lib as input.

dumpbin /all Contrib\Math\Source\mathcrt.lib shows

/DEFAULTLIB:"LIBC"

so it looks like this is trying to pull in libc.lib.


I could not see mathcrt.lib itself being rebuilt.
Where did it come from ?

How could I rebuild it ?


Rudif

kichik
25th August 2006 13:52 UTC

Math is a bit problematic as well. mathcrt.lib was generated from some freely available code on the web I can't currently find. I was sure I wrote it down somewhere, but I can't find it right now...

To avoid the problem you can remove the inclusion of mathcrt.lib as well as mathcrt.h and have VC add its own implementation of the mathematical functions. It'll be significantly larger, but it should work.

Please use [ quote ] and [ code ] for a nicer message format in the future.

Joost Verburg
3rd September 2006 21:12 UTC

Any progess? I would really like to be able to use MSVC 2005 Express with NSIS.

Rudif
3rd September 2006 22:22 UTC

No progress on my side, I had other priorities in the last few weeks. Unless someone beats me to it, I intend to continue work on porting to VC8 in early October.

Rudif

onad
4th September 2006 02:18 UTC

Joost, using MSVC 2005 Express the end result only runs if you have .NET 2.0 installed on target machine, at least that is what I read (Express if the *Free* MS VC8 version right?)

Have not tested myself yet...

Joost Verburg
4th September 2006 13:12 UTC

That's not true. You can of course develop .NET applications using Visual C++ 2005, but you can also create native Windows applications.

onad
5th September 2006 11:22 UTC

That is not what I said. I understood from MS MSDN site that EVEN with NATIVE Win32 C/C++ apps you need to have .NET installed. The compiled exe embedds a check for this.

That is why it is free probably with MS there is mostly a catch. This time it is to get as much PC with .NET installed in this belong to their strategy I guess.

onad
5th September 2006 11:26 UTC

My offer to you:

I can easily test this for you, please send a simple application you made with VC8 Express and I let it run on various Win32 OS's without .NET installed and post the result in the forum.

Joost Verburg
5th September 2006 12:01 UTC

A native Windows application doesn't depend on .NET, that's why it's called native. You can create native programs with VC8 Express and they really don't need .NET. I also verified this myself.

Rudif
7th September 2006 16:49 UTC

Kichik


I made some progress towards building the math.dll with scons / VC8, but I got stuck a the end.


1- Following your advice, in Contrib\Math\SConscript I removed mathcrt.lib and I added memset.c

   files = Split("""
        Source/Math.c
        Source/MyMath.c
        Source/plugin.c
<    Source/mathcrt.lib
->     #SCons\Config\memset.c
   """)

@@ -4,4 +4,6 @@
   #pragma once
   
-> #ifdef ORIGINAL
-> 
   extern "C"
   {

@@ -85,3 +87,42 @@
   void _fpreset(void);
   
<  }
-> }
-> 
-> #else
-> 
-> #include <math.h>
-> 
-> #define    DBL_MAX_EXP          308
-> 
-> #define   _fsin   sin
-> #define   _fsinh  sinh
-> #define   _fasin  asin
-> #define   _fcos   cos
-> #define   _fcosh  cosh
-> #define   _facos  acos
-> #define   _ftan   tan
-> #define   _ftanh  tanh
-> #define   _fatan  atan
-> #define   _fabs   abs
-> #define   _flog   log
-> #define   _flog10 log10
-> #define   _fexp   exp
-> #define   _fsqrt  sqrt
-> #define   _fceil  ceil
-> #define   _floor  floor
-> #define   _fatan2 atan2
-> #define   _fpow   pow
-> #define   _fmod   fmod
-> #define   _frexp  frexp
-> #define   _fmodf  modf
-> 
-> extern "C"
-> {
-> 
-> void _fpreset(void);
-> 
-> }
-> 
-> #endif 

@@ -103,4 +103,5 @@
   }
   
-> 
   #define MATHFUNCNUM 29
   const MathFunction MathFunctions[MATHFUNCNUM] = {

@@ -122,7 +123,7 @@
       {{'f','l','r'}, ITF_MATH1 >> 8, _floor},
   
<      {{'a','t','2'}, ITF_MATH2 >> 8, (Math1FuncPtr)_fatan2},
<      {{'p','o','w'}, ITF_MATH2 >> 8, (Math1FuncPtr)_fpow},
<      {{'f','m','d'}, ITF_MATH2 >> 8, (Math1FuncPtr)_fmod},
->     {{'a','t','2'}, ITF_MATH2 >> 8, (Math1FuncPtr)(Math2FuncPtr)_fatan2},
->     {{'p','o','w'}, ITF_MATH2 >> 8, (Math1FuncPtr)(Math2FuncPtr)_fpow},
->     {{'f','m','d'}, ITF_MATH2 >> 8, (Math1FuncPtr)(Math2FuncPtr)_fmod},
   
       // type conversions

@@ -137,6 +138,6 @@
       {{'c',0,0}, ITF_TYPE >> 8, (Math1FuncPtr)FTT_CHAR},
   
<      {{'f','e','x'}, ITF_MATH2 >> 8, (Math1FuncPtr)_frexp},
<      {{'m','d','f'}, ITF_MATH2 >> 8, (Math1FuncPtr)_fmodf},
->     {{'f','e','x'}, ITF_MATH2 >> 8, (Math1FuncPtr)(Math2iFuncPtr)_frexp},
->     {{'m','d','f'}, ITF_MATH2 >> 8, (Math1FuncPtr)(Math2dFuncPtr)_fmodf},
   };
   

@@ -200,4 +200,15 @@
   extern "C"
       int _floatp10(double *fnum, int *fsign, int prec);
->   
-> #ifndef ORIGINAL
-> extern "C"
-> int _floatp10(double *fnum, int *fsign, int prec)
-> {
->   // dummy stub for now
->   return 0; 
-> }
-> #endif
-> 
-> 
   extern "C"
       int _ftol(double num);

scons: warning: Two different environments were specified for target H:\Sandbox\3rdparty\nsis-2.19-src\SCo
ns\Config\memset.obj,
        but they appear to have the same action: $SHCC $SHCCFLAGS $CCCOMFLAGS
File "SConstruct", line 460, in BuildPlugin

scons: *** Two environments with different actions were specified for the same target: H:\Sandbox\3rdparty
\nsis-2.19-src\SCons\Config\memset.obj
File "SConstruct", line 460, in BuildPlugin

kichik
8th September 2006 18:00 UTC

It complains about memset.c being built twice in the same location. Copy memset.c over to the Math directory and useit from there for building Math.

_floatp10 was part of mathcrt.lib, I don't have the source code for it.

Rudif
9th September 2006 20:12 UTC

kichik,

I tried to advance my port to VC8, before leaving for 3 weeks vacations.

Not much to report on the success side, I am still stuck on Math.dll.


I added a copy of memset.c to Math\Sources directory, and added it to sconscript, replacing the mathcrt.lib.

        target = 'Math'

        files = Split("""
                Source/Math.c
                Source/MyMath.c
                Source/plugin.c
            Source/memset.c
        """)

link /nologo /opt:nowin98 /map /entry:DllMain /dll /out:build\release\Math\Math.dll kernel32.lib build\release\Math\Sour
ce\Math.obj build\release\Math\Source\MyMath.obj build\release\Math\Source\plugin.obj build\release\Math\Source\memset.o
bj
LIBCMT.lib(fpinit.obj) : error LNK2005: __fltused already defined in Math.obj
   Creating library build\release\Math\Math.lib and object build\release\Math\Math.exp
LIBCMT.lib(crt0.obj) : error LNK2019: unresolved external symbol _main referenced in function ___tmainCRTStartup
build\release\Math\Math.dll : fatal error LNK1120: 1 unresolved externals
scons: *** [build\release\Math\Math.dll] Error 1120
scons: building terminated because of errors.

//int _fltused;

link /nologo /opt:nowin98 /map /entry:DllMain /dll /out:build\release\Math\Math.dll kernel32.lib build\release\Math\Sour
ce\Math.obj build\release\Math\Source\MyMath.obj build\release\Math\Source\plugin.obj build\release\Math\Source\memset.o
bj
   Creating library build\release\Math\Math.lib and object build\release\Math\Math.exp
LIBCMT.lib(crt0.obj) : error LNK2019: unresolved external symbol _main referenced in function ___tmainCRTStartup
build\release\Math\Math.dll : fatal error LNK1120: 1 unresolved externals
scons: *** [build\release\Math\Math.dll] Error 1120
scons: building terminated because of errors.

H:\Sandbox\3rdparty\nsis-2.19-src-2>link /nologo /opt:nowin98 /map  /dll /out:build\release\Math\Math.dll
build\release\Math\Source\Math.obj build\release\Math\Source\MyMath.obj build\release\Math\Source\plugin.obj build\relea
se\Math\Source\memset.obj | tee 20060909-1900-link.txt
   Creating library build\release\Math\Math.lib and object build\release\Math\Math.exp
MyMath.obj : error LNK2019: unresolved external symbol __ftol2_sse referenced in function "void __cdecl FloatFormatF(cha
r *,double,int)" (?FloatFormatF@@YAXPADNH@Z)
build\release\Math\Math.dll : fatal error LNK1120: 1 unresolved externals

defenv.Append(CCFLAGS = ' /QIfist')

H:\Sandbox\3rdparty\nsis-2.19-src-2>link /nologo /opt:nowin98 /map  /dll /out:build\release\Math\Math.dll
kernel32.lib build\release\Math\Source\Math.obj build\release\Math\Source\MyMath.obj build\release\Math\Source\plugin.ob
j build\release\Math\Source\memset.obj  | tee 20060909-2039-scons.txt
   Creating library build\release\Math\Math.lib and object build\release\Math\Math.exp

def BuildPlugin(target, source, libs, examples = None, docs = None,
                entry = None, ### entry = 'DllMain', ...

link /nologo /opt:nowin98 /map /NODEFAULTLIB /dll /out:build\release\AdvSplash\AdvSplash.dll kernel32.lib user32.lib gdi
32.lib winmm.lib build\release\AdvSplash\advsplash.obj
   Creating library build\release\AdvSplash\AdvSplash.lib and object build\release\AdvSplash\AdvSplash.exp
LINK : error LNK2001: unresolved external symbol __DllMainCRTStartup@12
build\release\AdvSplash\AdvSplash.dll : fatal error LNK1120: 1 unresolved externals
scons: *** [build\release\AdvSplash\AdvSplash.dll] Error 1120
scons: building terminated because of errors.