mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Enabling static mozce shunt builds. landing vs8 beta 2 build tools. wince only.

This commit is contained in:
dougt%meer.net 2006-01-18 19:20:42 +00:00
Родитель 8831f761dd
Коммит 2f8a86511d
13 изменённых файлов: 71 добавлений и 197 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

24
build/wince/shunt/include/mozce_defs.h
Просмотреть файл

@ -37,11 +37,15 @@
#ifndef _MOZCE_DEFS
#define _MOZCE_DEFS
#define MOZCE_SHUNT_API
#ifndef MOZCE_STATIC_BUILD
#ifdef MOZCE_SHUNT_EXPORTS
#define MOZCE_SHUNT_API __declspec(dllexport)
#else
#define MOZCE_SHUNT_API __declspec(dllimport)
#endif
#endif
//#define USE_NC_LOGGING 1
@ -293,6 +297,11 @@
#endif
#define EOVERFLOW 79 /* Value too large to be stored in data type */
// From cderr.h
#ifdef FNERR_INVALIDFILENAME
#undef FNERR_INVALIDFILENAME
#endif
#define FNERR_INVALIDFILENAME 0x3002
// From signal.h
#define SIGABRT 0
@ -508,6 +517,19 @@ typedef struct mozce_MAT2 {
} mozce_MAT2;
//#if 0
#ifdef _BLENDFUNCTION
#undef _BLENDFUNCTION
#endif
#ifdef BLENDFUNCTION
#undef BLENDFUNCTION
#endif
#ifdef PBLENDFUNCTION
#undef PBLENDFUNCTION
#endif
typedef struct _BLENDFUNCTION
{
@ -517,6 +539,8 @@ typedef struct _BLENDFUNCTION
BYTE AlphaFormat;
}BLENDFUNCTION,*PBLENDFUNCTION;
//#endif
//
// currentlly defined blend function

103
build/wince/tools/ppc2003arm/arm-wince-gcc.c
Просмотреть файл

@ -1,103 +0,0 @@
#include <stdlib.h>
#include <stdio.h>
#include <process.h>
#include <errno.h>
#include <windows.h>
#include "toolpaths.h"
int
main(int argc, char **argv)
{
int iRetVal;
int startOfArgvs;
int i = 0;
int j = 0;
int link = 0;
char* args[1000];
char outputFileArg[1000];
args[i++] = "clarm.exe";
args[i++] = "/I\"" WCE_INC "\"";
args[i++] = "/I\"" SHUNT_INC "\"";
args[i++] = "/FI\"mozce_shunt.h\"";
args[i++] = "/DARM";
args[i++] = "/DWINCE";
args[i++] = "/D_WIN32_WCE=420";
args[i++] = "/DUNDER_CE=420";
args[i++] = "/DWIN32_PLATFORM_PSPC=400";
args[i++] = "/D_ARM_";
args[i++] = "/DDEPRECATE_SUPPORTED";
args[i++] = "/DSTDC_HEADERS";
// args[i++] = "/F5000000";
args[i++] = "/Gy"; // For link warning LNK1166
// args[i++] = "/Gf";
// args[i++] = "/GF";
// args[i++] = "/QRxscale";
// args[i++] = "/QRxscalesched";
// args[i++] = "/Ox";
startOfArgvs = i;
i += argpath_conv(&argv[1], &args[i]);
// if /Fe is passed, then link
//
// if -o is passed, then blank out this argument, and place a "/Fo"
// before the next argument
while(argv[j])
{
if (strncmp(argv[j], "-o", 2) == 0)
{
if ( strstr(args[startOfArgvs+j], ".obj") )
{
// If we are outputting a .OBJ file, then we are
// NOT linking, and we need to do some fancy
// footwork to output "/FoFILENAME" as an argument
args[startOfArgvs+j-1] = "";
strcpy(outputFileArg, "/Fo");
strcat(outputFileArg, args[startOfArgvs+j]);
args[startOfArgvs+j] = outputFileArg;
} else
{
// Otherwise, we are linking as usual
link = 1;
}
}
// if (strncmp(argv[j], "-o", 2) == 0)
// {
// link = 1;
// }
j++;
}
if (link)
{
args[i++] = "/link";
// args[i++] = "-STACK:0x5000000,0x100000";
args[i++] = "-ENTRY:mainACRTStartup";
args[i++] = "-SUBSYSTEM:WINDOWSCE,4.20";
args[i++] = "-MACHINE:ARM";
args[i++] = "-LIBPATH:\"" WCE_LIB "\"";
args[i++] = "-LIBPATH:\"" SHUNT_LIB "\"";
args[i++] = "shunt.lib";
args[i++] = "winsock.lib";
args[i++] = "corelibc.lib";
args[i++] = "coredll.lib";
}
args[i] = NULL;
//dumpargs(args);
iRetVal = _spawnv( _P_WAIT, CL_PATH, args );
if (iRetVal == -1)
{
printf("-----------------> %d <----------------------\n\n\n\n", errno);
}
return 0;
}

62
build/wince/tools/ppc2003arm/arm-wince-link.c
Просмотреть файл

@ -1,62 +0,0 @@
#include <stdlib.h>
#include <stdio.h>
#include <process.h>
#include "toolpaths.h"
int
main(int argc, char **argv)
{
int iRetVal;
char* args[1000];
int i = 0;
int j = 0;
int k = 0;
// Clear any link env variable that might get us tangled up
_putenv("LINK=");
args[i++] = "link.exe";
args[i++] = "/SUBSYSTEM:WINDOWSCE,4.20";
args[i++] = "/MACHINE:ARM";
args[i++] = "/LIBPATH:\"" WCE_LIB "\"";
args[i++] = "/LIBPATH:\"" SHUNT_LIB "\"";
args[i++] = "winsock.lib";
args[i++] = "corelibc.lib";
args[i++] = "coredll.lib";
args[i++] = "ceshell.lib";
args[i++] = "shunt.lib";
args[i++] = "/NODEFAULTLIB:LIBC";
args[i++] = "/NODEFAULTLIB:OLDNAMES";
// args[i++] = "/STACK:0x5000000,0x100000";
// if -DLL is not passed, then change the entry to 'main'
while(argv[j])
{
if (strncmp(argv[j], "-DLL", 4) == 0 || strncmp(argv[j], "/DLL", 4) == 0)
{
k = 1;
break;
}
j++;
}
if (k==0)
args[i++] = "/ENTRY:mainACRTStartup";
argpath_conv(&argv[1], &args[i]);
// dumpargs(args);
iRetVal = _spawnv( _P_WAIT, LINK_PATH, args );
if (iRetVal == -1)
{
printf("-----------------> %d <----------------------\n\n\n\n", errno);
}
return 0;
}

8
build/wince/tools/ppc2003arm/toolpaths.h
Просмотреть файл

@ -7,7 +7,7 @@
#define WCE_INC "c:/Program Files/Windows CE Tools/wce420/POCKET PC 2003/Include/Armv4/"
#define WCE_LIB "c:/Program Files/Windows CE Tools/wce420/POCKET PC 2003/Lib/Armv4/"
#define SHUNT_LIB TOPSRCDIR "/build/wince/shunt/build/ARMV4Rel/"
#define SHUNT_LIB TOPSRCDIR "/build/wince/shunt/build/static/ARMV4Dbg/"
#define SHUNT_INC TOPSRCDIR "/build/wince/shunt/include/"
#define ASM_PATH WCE_BIN "armasm.exe"
@ -18,15 +18,15 @@
#define MAX_NOLEAK_BUFFERS 100
char noleak_buffers[MAX_NOLEAK_BUFFERS][1024];
static int next_buffer = 0;
int argpath_conv(char **args_in, char **args_out)
{
int i = 0;
while (args_in[i])
{
args_out[i] = args_in[i];
if (args_in[i])
{
char *offset = strstr(args_out[i], "/cygdrive/");

5
build/wince/tools/vs8ppc2003arm/arm-wince-as.c
Просмотреть файл

@ -7,9 +7,12 @@ main(int argc, char **argv)
int i = 0;
args[i++] = ASM_PATH;
args[i++] = "-I\"" WCE_INC "\"";
i += argpath_conv(&argv[1], &args[i]);
run(args);
dumpargs(args);
run(args);
return 0;
}

30
build/wince/tools/vs8ppc2003arm/arm-wince-gcc.c
Просмотреть файл

@ -10,7 +10,7 @@ main(int argc, char **argv)
char* args[1000];
char outputFileArg[1000];
args[i++] = CL_PATH;
args[i++] = "/I\"" WCE_INC "\"";
args[i++] = "/I\"" SHUNT_INC "\"";
@ -18,12 +18,13 @@ main(int argc, char **argv)
args[i++] = "/DARM";
args[i++] = "/DWINCE";
args[i++] = "/D_WIN32_WCE=420";
args[i++] = "/DUNDER_CE=420";
args[i++] = "/DWIN32_PLATFORM_PSPC=400";
args[i++] = "/D_WIN32_WCE=501";
args[i++] = "/DUNDER_CE=501";
args[i++] = "/DWIN32_PLATFORM_WFSP";
args[i++] = "/D_ARM_";
args[i++] = "/DDEPRECATE_SUPPORTED";
args[i++] = "/DSTDC_HEADERS";
// args[i++] = "/DDEPRECATE_SUPPORTED";
// args[i++] = "/DSTDC_HEADERS";
args[i++] = "/Gy"; // For link warning LNK1166
@ -69,18 +70,27 @@ main(int argc, char **argv)
args[i++] = "/link";
args[i++] = "-ENTRY:mainACRTStartup";
args[i++] = "-SUBSYSTEM:WINDOWSCE,4.20";
args[i++] = "-MACHINE:ARM";
args[i++] = "/SUBSYSTEM:WINDOWSCE,5.01";
args[i++] = "/MACHINE:THUMB";
args[i++] = "-LIBPATH:\"" WCE_LIB "\"";
args[i++] = "-LIBPATH:\"" SHUNT_LIB "\"";
args[i++] = "mozce_shunt.lib";
args[i++] = "shunt.lib";
args[i++] = "winsock.lib";
args[i++] = "corelibc.lib";
args[i++] = "coredll.lib";
args[i++] = "-OPT:REF";
args[i++] = "-OPT:ICF";
args[i++] = "-NODEFAULTLIB:LIBC";
args[i++] = "-NODEFAULTLIB:OLDNAMES.lib";
}
args[i] = NULL;
dumpargs(args);
run(args);
return 0;
}

5
build/wince/tools/vs8ppc2003arm/arm-wince-lib.c
Просмотреть файл

@ -8,8 +8,9 @@ main(int argc, char **argv)
int i = 0;
args[i++] = LIB_PATH;
args[i++] = "/SUBSYSTEM:WINDOWSCE,4.20";
args[i++] = "/MACHINE:ARM";
// args[i++] = "/SUBSYSTEM:WINDOWSCE,4.20";
// args[i++] = "/MACHINE:ARM";
argpath_conv(&argv[1], &args[i]);

19
build/wince/tools/vs8ppc2003arm/arm-wince-link.c
Просмотреть файл

@ -9,12 +9,8 @@ main(int argc, char **argv)
int j = 0;
int k = 0;
// Clear any link env variable that might get us tangled up
_putenv("LINK=");
args[i++] = LINK_PATH;
args[i++] = "/SUBSYSTEM:WINDOWSCE,4.20";
args[i++] = "/MACHINE:ARM";
args[i++] = "/LIBPATH:\"" WCE_LIB "\"";
args[i++] = "/LIBPATH:\"" SHUNT_LIB "\"";
@ -22,11 +18,20 @@ main(int argc, char **argv)
args[i++] = "corelibc.lib";
args[i++] = "coredll.lib";
args[i++] = "ceshell.lib";
args[i++] = "ole32.lib";
args[i++] = "mozce_shunt.lib";
args[i++] = "shunt.lib";
args[i++] = "/subsystem:\"WINDOWSCE,5.01\"";
args[i++] = "/MACHINE:THUMB";
args[i++] = "-OPT:REF";
args[i++] = "-OPT:ICF";
args[i++] = "/NODEFAULTLIB:LIBC";
args[i++] = "/NODEFAULTLIB:OLDNAMES";
args[i++] = "/NODEFAULTLIB:LIBCMT";
args[i++] = "/NODEFAULTLIB:LIBCMTD";
// if -DLL is not passed, then change the entry to 'main'
while(argv[j])
@ -44,7 +49,7 @@ main(int argc, char **argv)
argpath_conv(&argv[1], &args[i]);
// dumpargs(args);
dumpargs(args);
run(args);
return 0;

2
build/wince/tools/vs8ppc2003arm/build_tools.bat
Просмотреть файл

@ -11,7 +11,7 @@ cl /O2 arm-wince-as.c
cl /O2 arm-wince-gcc.c
cl /O2 arm-wince-lib.c
cl /O2 arm-wince-link.c
rm *.obj
rm *.ilk
rm *.pdb

1
minimo/base/wince/minimo-link-comps
Просмотреть файл

@ -22,7 +22,6 @@ chrome
mork
tkitcmps
xmlextra
websrvcs
gkplugin
softkey
phone

1
minimo/base/wince/minimo-link-names
Просмотреть файл

@ -22,7 +22,6 @@ nsMorkModule
tkAutoCompleteModule
nsToolkitCompsModule
nsXMLExtrasModule
nsWebServicesModule
nsPluginModule
SoftKeyBoardModule
nsPhoneSupportModule

2
minimo/config/wince/minimo.inf
Просмотреть файл

@ -27,7 +27,6 @@ CEShortcuts=Shortcuts
[SourceDisksFiles]
minimo.exe=1
minimo_runner.exe=1
shunt.dll=1
classic.jar=2
classic.manifest=2
@ -89,7 +88,6 @@ Shortcuts=0,%CE11% ; Start Menuz
[Files.minimo]
minimo.exe,,,0
minimo_runner.exe,,,0
shunt.dll,,,0
[Files.chrome]
classic.jar,,,0

6
minimo/config/wince_package.sh
Просмотреть файл

@ -99,9 +99,9 @@ cp -a ../customization/HelperAppDlg.js $OBJDIR/dist/minimo/co
cat ../customization/ua.css.additions >> $OBJDIR/dist/minimo/res/ua.css
echo Copying ARM shunt lib. Adjust if you are not building ARM
cp -a ../../build/wince/shunt/build/ARMV4Rel/shunt.dll $OBJDIR/dist/minimo
#echo Copying ARM shunt lib. Adjust if you are not building ARM
#
#cp -a ../../build/wince/shunt/build/ARMV4Rel/shunt.dll $OBJDIR/dist/minimo
popd