WIP: nlsstub implementation

modules/calendar/makefile.win

@@ -124,6 +124,11 @@ LLIBS = $(LLIBS) \
     $(DIST)\lib\nscnv30.lib \
     $(DIST)\lib\nssb30.lib \
     $(DIST)\lib\pr$(MOZ_BITS)40.lib \
+!else
+!ifdef MOZ_TREX_FREE
+    $(DIST)\lib\nlsstub10.lib \
+    $(DIST)\lib\libnspr21.lib \
+    $(DIST)\lib\libplc21.lib \
 !else
     $(DIST)\lib\nsfmt$(MOZ_BITS)30.lib \
     $(DIST)\lib\nsuni$(MOZ_BITS)30.lib \
@@ -134,6 +139,7 @@ LLIBS = $(LLIBS) \
     $(DIST)\lib\libnspr21.lib \
     $(DIST)\lib\libplc21.lib \
 !endif
+!endif
 !if defined(MOZ_CAPI)
     .\capi\capi.lib \
 !endif

modules/calendar/src/makefile.win

@@ -17,7 +17,11 @@ NS_DEPTH=..\..\
 !endif
 
 !ifdef MOZ_TREX
+!ifdef MOZ_TREX_FREE
+DIRS=nlsstub libcal
+!else
 DIRS=libcal
+!endif
 !else
 DIRS=libjulian
 !endif

modules/calendar/src/nlsstub/inc/makefile.win

@@ -19,7 +19,7 @@ MODULE = nls
 LCFLAGS= -DMOZ_TREX -DLIBJULIAN $(LCFLAGS)
 CFLAGS= -DMOZ_TREX $(CFLAGS)
 
-EXPORTS = unistring.h calendar.h ptypes.h locid.h hashtab.h timezone.h smpdtfmt.h gregocal.h datefmt.h simpletz.h parsepos.h unicode.h
+EXPORTS = unistring.h calendar.h ptypes.h locid.h hashtab.h timezone.h smpdtfmt.h gregocal.h datefmt.h simpletz.h parsepos.h unicode.h nlsloc.h
 
 #//------------------------------------------------------------------------
 #//

modules/calendar/src/nlsstub/inc/nlsloc.h

@@ -0,0 +1,12 @@
+#ifndef nlsloc_h__
+#define nlsloc_h__
+
+#include "ptypes.h"
+
+typedef PRUint32 NLS_ThreadInfo;
+typedef PRUint32 NLS_ErrorCode;
+
+NLS_ErrorCode NLS_Initialize(const NLS_ThreadInfo * aThreadInfo, const char * aDataDirectory);
+NLS_ErrorCode NLS_Terminate(void);
+
+#endif

modules/calendar/src/nlsstub/inc/ptypes.h

@@ -1,6 +1,8 @@
 #ifndef ptypes_h__
 #define ptypes_h__
 
+#include "nspr.h"
+
 typedef double Date;
 
 #define ZERO_ERROR 0

modules/calendar/src/nlsstub/src/makefile.win

@@ -6,10 +6,12 @@
 
 #//------------------------------------------------------------------------
 #//
-#// Specify the NS_DEPTH of the current directory relative to the
+#// Specify the depth of the current directory relative to the
 #// root of NS
 #//
+#// Need to include capi.lib in LLIBS later
 #//------------------------------------------------------------------------
+
 NS_DEPTH=..\..\..\..\..\
 
 DEPTH = $(NS_DEPTH)
@@ -20,5 +22,57 @@ DEPTH = $(NS_DEPTH)
 #//
 #//------------------------------------------------------------------------
 
+LIBRARY_NAME = nlsstub10
+
+LCFLAGS= -DLIBJULIAN $(LCFLAGS)
+
+DLLNAME         = nlsstub10
+PDBFILE         = $(DLLNAME).pdb
+MAPFILE         = $(DLLNAME).map
+#RESFILE        = $(DLLNAME).res
+DLL             =.\$(OBJDIR)\$(DLLNAME).dll
+MAKE_OBJ_TYPE   = DLL
+
+
+include <$(NS_DEPTH)/config/config.mak>
+
+REQUIRES=nspr
+
+OBJS = \
+        .\$(OBJDIR)\nlsloc.obj \
+        $(NULL)
+
+LLIBS = $(LLIBS) \
+    $(DIST)\lib\libnspr21.lib \
+    $(DIST)\lib\libplc21.lib \
+    $(NULL)
+
+LINCS=-I$(XPDIST)\public\nls
+
+#// From the old Manifest file
+CPPSRCS=nlsloc.cpp
+
+
+
+#//------------------------------------------------------------------------
+#//
+#// Include the common makefile rules
+#//
+#// Need to include capi.dll and capi.lib in libs later
+#//------------------------------------------------------------------------
+
 include <$(NS_DEPTH)/config/rules.mak>
 
+libs:: $(DLL)
+    $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
+    $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+    $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
+
+
+
+
+
+
+
+
+

modules/calendar/src/nlsstub/src/nlsloc.cpp

@@ -0,0 +1,20 @@
+/* -*- Mode: C; tab-width: 4; -*- */
+/*
+ * @(#)nls.cpp	Jim Saunders
+ *
+ * Copyright (c) 1995 Netscape Communications Corporation. All Rights Reserved.
+ *
+ */
+
+#include "nlsloc.h"
+
+NLS_ErrorCode NLS_Initialize(const NLS_ThreadInfo * aThreadInfo, const char * aDataDirectory)
+{
+  return 0;
+}
+
+NLS_ErrorCode NLS_Terminate(void)
+{
+  return 0;
+}
+