dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Jim Park's Unicode NSIS merging - Step 2 : merge TCHARs changes into trunk

Browse source 
Compiler output is identical before & after this step

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6037 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
wizou 2010-03-26 17:18:17 +00:00
commit cdf7735a77
206 changed files with 8437 additions and 6403 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/Tests/SConscript
View file

@ -78,11 +78,15 @@ scripts = Split("""
icon1.nsi
icon2.nsi
preprocessor.nsi
winver.nsi
""")
Import('env AddAvailableLibs AddZLib')
if env['UNICODE']:
scripts.append('Unicode/winver.nsi')
else:
scripts.append('ANSI/winver.nsi')
# Test scripts
env.TestScript(scripts)

2
Source/Tests/memcpy.c
View file

@ -1,3 +1,5 @@
// Reviewed for Unicode support by Jim Park -- 08/24/2007
#include "../Platform.h"
void NSISCALL mini_memcpy(void *out, const void *in, int len)

4
Source/Tests/mmap.cpp
View file

@ -1,3 +1,5 @@
// Unicode support by Jim Park -- 08/13/2007
//
#include <cppunit/extensions/HelperMacros.h>
#include "../mmap.h"
@ -11,7 +13,7 @@ int g_display_errors = 1;
FILE *g_output = stderr;
void quit() {
fprintf(g_output, "MMap quit\n");
_ftprintf(g_output, _T("MMap quit\n"));
}
class MMapTest : public CppUnit::TestFixture {

42
Source/Tests/specmatch.cpp
View file

@ -1,7 +1,7 @@
#include <cppunit/extensions/HelperMacros.h>
#include "../dirreader.h"
#include <string>
#include "tstring.h"
using namespace std;
@ -13,30 +13,30 @@ class SpecTest : public CppUnit::TestFixture {
public:
void testMatches() {
testMatch("test.exe", "test.exe", true);
testMatch("test", "test", true);
testMatch("test.exe", "test.*", true);
testMatch("test", "test.*", true);
testMatch("test", "????", true);
testMatch("test", "???", false);
testMatch("test", "*.exe", false);
testMatch("test.exe.bat", "*.exe", false);
testMatch("test.exe.bat", "*.bat", true);
testMatch("test.exe.bat", "*t", true);
testMatch("test.exe.bat", "*", true);
testMatch("test.exe.bat", "*x*", true);
testMatch("test.exe.exe", "*.*", true);
testMatch("test.exe.bat", "*.b*", true);
testMatch("test.exe.bat", "tes?.*.bat", true);
testMatch("test.exe.bat", "tes?.*bat", true);
testMatch("test.exe.bat", "tes?.*bat***.", true);
testMatch("test.exe", "????.*", true);
testMatch("testing.exe", "????.*", false);
testMatch(TEXT("test.exe"), TEXT("test.exe"), true);
testMatch(TEXT("test"), TEXT("test"), true);
testMatch(TEXT("test.exe"), TEXT("test.*"), true);
testMatch(TEXT("test"), TEXT("test.*"), true);
testMatch(TEXT("test"), TEXT("????"), true);
testMatch(TEXT("test"), TEXT("???"), false);
testMatch(TEXT("test"), TEXT("*.exe"), false);
testMatch(TEXT("test.exe.bat"), TEXT("*.exe"), false);
testMatch(TEXT("test.exe.bat"), TEXT("*.bat"), true);
testMatch(TEXT("test.exe.bat"), TEXT("*t"), true);
testMatch(TEXT("test.exe.bat"), TEXT("*"), true);
testMatch(TEXT("test.exe.bat"), TEXT("*x*"), true);
testMatch(TEXT("test.exe.exe"), TEXT("*.*"), true);
testMatch(TEXT("test.exe.bat"), TEXT("*.b*"), true);
testMatch(TEXT("test.exe.bat"), TEXT("tes?.*.bat"), true);
testMatch(TEXT("test.exe.bat"), TEXT("tes?.*bat"), true);
testMatch(TEXT("test.exe.bat"), TEXT("tes?.*bat***."), true);
testMatch(TEXT("test.exe"), TEXT("????.*"), true);
testMatch(TEXT("testing.exe"), TEXT("????.*"), false);
}
private:
void testMatch(string name, string spec, bool result) {
void testMatch(tstring name, tstring spec, bool result) {
CPPUNIT_ASSERT_EQUAL( dir_reader::matches(name, spec), result );
}

1
Source/Tests/winchar.cpp
View file

@ -1,3 +1,4 @@
// Reviewed for Unicode support by Jim Park -- 08/13/2007
#include <cppunit/extensions/HelperMacros.h>
#include "../winchar.h"