Nmap Development mailing list archives

Re: [nmap-svn] r28166 - nmap/zenmap/install_scripts/windows


From: jah <jah () zadkiel plus com>
Date: Fri, 24 Feb 2012 23:51:00 +0000

Hi folks,

In zenmap/install_scripts/windows/copy_and_compile.bat there's a command to move intl.dll from zenmap/dist/py2exe to 
zenmap/dist with a comment that the dll needs to be in the executable directory instead of the py2exe subdir.  This 
command failed for me when building nmap on win32 due to a bad directory separator - so I committed a fix for it.

I assume that the executable directory mentioned in the comment refers to the the windows nmap install dir and if 
that's a good assumption then I think that the move command can be removed entirely, for two reasons:

The nsis installer doesn't ensure intl.dll is installed into into the nmap install dir and there is anyway a copy in 
the py2exe subdir (which is put into dist/py2exe during compilation using py2exe - subsequent to the move operation 
under discussion).
On Windows XP and 7, Zenmap is happily loading intl.dll (via the libglib dll) from the py2exe subdir - irrespective of 
the presence of intl.dll in the install dir.

Does anyone know of any reason the move command shouldn't be removed?

Best,

jah

On 24/02/2012 20:28, commit-mailer () insecure org wrote:
Author: jah
Date: Fri Feb 24 12:28:17 2012
New Revision: 28166

Log:
Corrected a directory separator in the command to move intl.dll.


Modified:
   nmap/zenmap/install_scripts/windows/copy_and_compile.bat

Modified: nmap/zenmap/install_scripts/windows/copy_and_compile.bat
==============================================================================
--- nmap/zenmap/install_scripts/windows/copy_and_compile.bat  (original)
+++ nmap/zenmap/install_scripts/windows/copy_and_compile.bat  Fri Feb 24 12:28:17 2012
@@ -34,7 +34,7 @@
 xcopy %GTKDir%\bin\*.dll %LibraryDir% /S >> %Output%
 rem intl.dll is a special case; has to be in the executable directory instead of
 rem the py2exe subdirectory.
-move /Y %LibraryDir%/intl.dll %DistDir% >> %Output%
+move /Y %LibraryDir%\intl.dll %DistDir% >> %Output%
 xcopy %GTKDir%\etc %LibraryDir%\etc /S /I >> %Output%
 xcopy %GTKDir%\lib\gtk-2.0 %LibraryDir%\lib\gtk-2.0 /S /I >> %Output%
 xcopy %GTKDir%\share\themes\Default %LibraryDir%\share\themes\Default /S /I >> %Output%

_______________________________________________
Sent through the nmap-svn mailing list
http://cgi.insecure.org/mailman/listinfo/nmap-svn


_______________________________________________
Sent through the nmap-dev mailing list
http://cgi.insecure.org/mailman/listinfo/nmap-dev
Archived at http://seclists.org/nmap-dev/


Current thread: