[sword-cvs] icu-sword/source/tools/gencmn .cvsignore,1.4,1.5 decmn.vcproj,1.1,1.2 gencmn.c,1.4,1.5 gencmn.vcproj,1.1,1.2
sword@www.crosswire.org
sword@www.crosswire.org
Tue, 6 Apr 2004 03:11:04 -0700
- Previous message: [sword-cvs] icu-sword/source/tools/genccode genccode.8.in,1.3,1.4 genccode.c,1.4,1.5 genccode.vcproj,1.1,1.2
- Next message: [sword-cvs] icu-sword/as_is/os400 configure,1.3,1.4 unpax-icu.sh,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvs/core/icu-sword/source/tools/gencmn
In directory www:/tmp/cvs-serv8911/source/tools/gencmn
Modified Files:
.cvsignore decmn.vcproj gencmn.c gencmn.vcproj
Log Message:
ICU 2.8 sync
Index: .cvsignore
===================================================================
RCS file: /cvs/core/icu-sword/source/tools/gencmn/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- .cvsignore 10 Sep 2003 02:42:56 -0000 1.4
+++ .cvsignore 6 Apr 2004 10:10:00 -0000 1.5
@@ -1,6 +1,7 @@
-tmp
Debug
Release
+decmn_win32_Debug
+decmn_win32_Release
Makefile
*.d
*.pdb
Index: decmn.vcproj
===================================================================
RCS file: /cvs/core/icu-sword/source/tools/gencmn/decmn.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- decmn.vcproj 10 Sep 2003 02:42:56 -0000 1.1
+++ decmn.vcproj 6 Apr 2004 10:10:00 -0000 1.2
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.00"
+ Version="7.10"
Name="decmn"
SccProjectName=""
SccLocalPath="">
@@ -12,8 +12,8 @@
<Configurations>
<Configuration
Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
+ OutputDirectory=".\decmn_Win32_Release"
+ IntermediateDirectory=".\decmn_Win32_Release"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -28,31 +28,31 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
DisableLanguageExtensions="TRUE"
- PrecompiledHeaderFile=".\Release/decmn.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
+ PrecompiledHeaderFile=".\decmn_Win32_Release/decmn.pch"
+ AssemblerListingLocation=".\decmn_Win32_Release/"
+ ObjectFile=".\decmn_Win32_Release/"
+ ProgramDataBaseFileName=".\decmn_Win32_Release/"
WarningLevel="4"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"
- CommandLine="copy $(TargetPath) ..\..\..\bin
+ CommandLine="copy "$(TargetPath)" ..\..\..\bin
"
- Outputs="..\..\..\bin\$(InputName).exe"/>
+ Outputs="..\..\..\bin\$(TargetFileName)"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="icuuc.lib icutu.lib"
- OutputFile=".\Release/decmn.exe"
+ OutputFile=".\decmn_Win32_Release/decmn.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\lib"
- ProgramDatabaseFile=".\Release/decmn.pdb"
+ ProgramDatabaseFile=".\decmn_Win32_Release/decmn.pdb"
SubSystem="1"/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\Release/decmn.tlb"/>
+ TypeLibraryName=".\decmn_Win32_Release/decmn.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -66,12 +66,18 @@
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
+ OutputDirectory=".\decmn_Win32_Debug"
+ IntermediateDirectory=".\decmn_Win32_Debug"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -86,10 +92,10 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
- PrecompiledHeaderFile=".\Debug/decmn.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
+ PrecompiledHeaderFile=".\decmn_Win32_Debug/decmn.pch"
+ AssemblerListingLocation=".\decmn_Win32_Debug/"
+ ObjectFile=".\decmn_Win32_Debug/"
+ ProgramDataBaseFileName=".\decmn_Win32_Debug/"
BrowseInformation="1"
WarningLevel="4"
SuppressStartupBanner="TRUE"
@@ -97,23 +103,23 @@
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"
- CommandLine="copy $(TargetPath) ..\..\..\bin
+ CommandLine="copy "$(TargetPath)" ..\..\..\bin
"
- Outputs="..\..\..\bin\$(InputName).exe"/>
+ Outputs="..\..\..\bin\$(TargetFileName)"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="icuucd.lib icutud.lib"
- OutputFile=".\Debug/decmn.exe"
+ OutputFile=".\decmn_Win32_Debug/decmn.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\lib"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\Debug/decmn.pdb"
+ ProgramDatabaseFile=".\decmn_Win32_Debug/decmn.pdb"
SubSystem="1"/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\Debug/decmn.tlb"/>
+ TypeLibraryName=".\decmn_Win32_Debug/decmn.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -127,9 +133,17 @@
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
+ <References>
+ </References>
<Files>
<Filter
Name="Source Files"
Index: gencmn.c
===================================================================
RCS file: /cvs/core/icu-sword/source/tools/gencmn/gencmn.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gencmn.c 10 Sep 2003 02:42:56 -0000 1.4
+++ gencmn.c 6 Apr 2004 10:10:00 -0000 1.5
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 1999-2001, International Business Machines
+* Copyright (C) 1999-2003, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -25,6 +25,7 @@
#include "cstring.h"
#include "filestrm.h"
#include "toolutil.h"
+#include "unicode/uclean.h"
#include "unewdata.h"
#include "uoptions.h"
@@ -34,6 +35,42 @@
#define COMMON_DATA_NAME U_ICUDATA_NAME
#define DATA_TYPE "dat"
+/* ICU package data file format (.dat files) ------------------------------- ***
+
+Description of the data format after the usual ICU data file header
+(UDataInfo etc.).
+
+Format version 1
+
+A .dat package file contains a simple Table of Contents of item names,
+followed by the items themselves:
+
+1. ToC table
+
+uint32_t count; - number of items
+UDataOffsetTOCEntry entry[count]; - pair of uint32_t values per item:
+ uint32_t nameOffset; - offset of the item name
+ uint32_t dataOffset; - offset of the item data
+both are byte offsets from the beginning of the data
+
+2. item name strings
+
+All item names are stored as char * strings in one block between the ToC table
+and the data items.
+
+3. data items
+
+The data items are stored following the item names block.
+Each data item is 16-aligned.
+The data items are stored in the sorted order of their names.
+
+Therefore, the top of the name strings block is the offset of the first item,
+the length of the last item is the difference between its offset and
+the .dat file length, and the length of all previous items is the difference
+between its offset and the next one.
+
+----------------------------------------------------------------------------- */
+
/* UDataInfo cf. udata.h */
static const UDataInfo dataInfo={
sizeof(UDataInfo),
@@ -282,6 +319,12 @@
}
}
+ /* pad to 16-align the last file (cleaner, avoids growing .dat files in icuswap) */
+ length&=0xf;
+ if(length!=0) {
+ udata_writePadding(out, 16-length);
+ }
+
/* finish */
udata_finish(out, &errorCode);
if(U_FAILURE(errorCode)) {
@@ -360,7 +403,7 @@
sprintf(
buffer,
- "U_EXPORT const struct {\n"
+ "U_EXPORT struct {\n"
" uint16_t headerSize;\n"
" uint8_t magic1, magic2;\n"
" UDataInfo info;\n"
Index: gencmn.vcproj
===================================================================
RCS file: /cvs/core/icu-sword/source/tools/gencmn/gencmn.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gencmn.vcproj 10 Sep 2003 02:42:56 -0000 1.1
+++ gencmn.vcproj 6 Apr 2004 10:10:00 -0000 1.2
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.00"
+ Version="7.10"
Name="gencmn"
SccProjectName=""
SccLocalPath="">
@@ -37,9 +37,9 @@
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"
- CommandLine="copy $(TargetPath) ..\..\..\bin
+ CommandLine="copy "$(TargetPath)" ..\..\..\bin
"
- Outputs="..\..\..\bin\$(InputName).exe"/>
+ Outputs="..\..\..\bin\$(TargetFileName)"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
@@ -66,7 +66,13 @@
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -97,9 +103,9 @@
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"
- CommandLine="copy $(TargetPath) ..\..\..\bin
+ CommandLine="copy "$(TargetPath)" ..\..\..\bin
"
- Outputs="..\..\..\bin\$(InputName).exe"/>
+ Outputs="..\..\..\bin\$(TargetFileName)"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
@@ -127,9 +133,17 @@
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
+ <References>
+ </References>
<Files>
<Filter
Name="Source Files"
- Previous message: [sword-cvs] icu-sword/source/tools/genccode genccode.8.in,1.3,1.4 genccode.c,1.4,1.5 genccode.vcproj,1.1,1.2
- Next message: [sword-cvs] icu-sword/as_is/os400 configure,1.3,1.4 unpax-icu.sh,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]