Bug 506502 - Remove "MOZ_BITS == 16" parts (in dbm and nsprpub); (Bv1-MC) Remove (last) 3 *.mak; r=gal
authorSerge Gautherie <sgautherie.bz@free.fr>
Tue, 25 Aug 2009 15:22:26 +0200
changeset 31808 e2cc9f1841d7be96ebfb27cff493a8a8adfaf08b
parent 31807 2457c3db5ba694d1b7e563ed21c98495b06df0a5
child 31809 525d2bb69a7cda9dd2c0ab58ff063024831bcae6
push id8743
push usersgautherie.bz@free.fr
push dateTue, 25 Aug 2009 13:22:51 +0000
treeherderautoland@525d2bb69a7c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgal
bugs506502
milestone1.9.3a1pre
Bug 506502 - Remove "MOZ_BITS == 16" parts (in dbm and nsprpub); (Bv1-MC) Remove (last) 3 *.mak; r=gal
config/javarules.mak
js/jsd/jsd.mak
js/jsd/jsdshell.mak
deleted file mode 100644
--- a/config/javarules.mak
+++ /dev/null
@@ -1,185 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# This file contains make rules for building java files using mozilla's
-# make system.  To use this file, you must include this file before
-# including rules.mak. Like this:
-
-# include <$(DEPTH)\config\javarules.mak>
-# include <$(DEPTH)\config\rules.mak>
-
-
-!ifdef JDIRS
-!if defined(JAVA_OR_NSJVM)
-#//------------------------------------------------------------------------
-#//
-#// Rule to recursively make all subdirectories specified by the JDIRS target
-#//
-#//------------------------------------------------------------------------
-
-export:: $(JAVA_DESTPATH) $(JDIRS)
-
-$(JDIRS):: $(JAVA_DESTPATH) $(TMPDIR)
-
-!if "$(WINOS)" == "WIN95"
-JDIRS = $(JDIRS:/=\)
-!endif
-
-!if defined(NO_CAFE)
-
-$(JDIRS)::
-    @echo +++ make: building package: $@
-    @echo $(JAVAC_PROG) $(JAVAC_FLAGS) > $(TMPDIR)\javac.cfg
-    -@$(DEPTH)\config\buildpkg $(TMPDIR)\javac.cfg $@ 
-    @$(RM) $(TMPDIR)\javac.cfg
-    @$(DEPTH)\config\buildpkg $@ $(DEPTH)\dist\classes
-
-!else
-
-# compile using symantec cafe's super-speedy compiler!
-$(JDIRS)::
-    @echo +++ make: building package $@
-!if "$(WINOS)" == "WIN95"
-    -@$(MKDIR) $(DEPTH)\dist\classes\$(@:/=\)
-!else
-    -@$(MKDIR) $(DEPTH)\dist\classes\$@ 2> NUL
-!endif
-    $(MOZ_TOOLS)\bin\sj -classpath $(JAVA_DESTPATH);$(JAVA_SOURCEPATH) \
-            -d $(JAVA_DESTPATH) $(JAVAC_OPTIMIZER) $@\*.java
-
-
-!endif # NO_CAFE
-
-clobber clobber_all::
-    -for %g in ($(JDIRS)) do $(RM_R) $(XPDIST:/=\)/classes/%g
-
-!endif # JAVA_OR_NSJVM
-!endif # JDIRS
-
-
-
-#//------------------------------------------------------------------------
-#//
-#// JMC
-#//
-#// JSRCS   .java files to be compiled (.java extension included)
-#//
-#//------------------------------------------------------------------------
-!if defined(JAVA_OR_NSJVM)
-!if defined(JSRCS)
-
-JSRCS_DEPS = $(JAVA_DESTPATH) $(JAVA_DESTPATH)\$(PACKAGE) $(TMPDIR)
-
-# Can't get moz cafe to compile a single file
-!if defined(NO_CAFE)
-
-export:: $(JSRCS_DEPS)
-    @echo +++ make: building package: $(PACKAGE)
-	$(PERL) $(DEPTH)\config\outofdate.pl \
-	-d $(JAVA_DESTPATH)\$(PACKAGE) $(JSRCS) >> $(TMPDIR)\javac.cfg
-	-$(JAVAC_PROG) -argfile $(TMPDIR)\javac.cfg
-	@echo $(TMPDIR)
-#	@$(RM) $(TMPDIR)\javac.cfg
-!else
-
-# compile using symantec cafe's super-speedy compiler!
-export:: $(JSRC_DEPS)
-    @echo +++ make: building package: $(PACKAGE)	
-	@echo -d $(JAVA_DESTPATH) $(JAVAC_OPTIMIZER) \
-	   -classpath $(JAVA_DESTPATH);$(JAVA_SOURCEPATH) > $(TMPDIR)\javac.cfg
-	@$(PERL) $(DEPTH)\config\sj.pl \
-	 $(JAVA_DESTPATH)\$(PACKAGE)\ $(TMPDIR)\javac.cfg <<
-	$(JSRCS)
-<<
-
-!endif #NO_CAFE
-
-clobber::
-    -for %g in ($(JSRCS:.java=.class)) do $(RM) $(XPDIST:/=\)/classes/$(PACKAGE:/=\)/%g
-
-!endif # JSRCS
-
-#//------------------------------------------------------------------------
-#//
-#// JMC
-#//
-#// JMC_EXPORT  .class files to be copied from XPDIST/classes/PACKAGE to
-#//                 XPDIST/jmc (without the .class extension)
-#//
-#//------------------------------------------------------------------------
-!if defined(JMC_EXPORT)
-export:: $(JMCSRCDIR)
-    for %g in ($(JMC_EXPORT)) do $(MAKE_INSTALL:/=\) $(JAVA_DESTPATH)\$(PACKAGE:/=\)\%g.class $(JMCSRCDIR)
-
-clobber::
-    -for %f in ($(JMC_EXPORT)) do $(RM) $(JMCSRCDIR:/=\)\%f.class
-!endif # JMC_EXPORT
-!endif # JAVA_OR_NSJVM
-
-#//------------------------------------------------------------------------
-#//
-#// JMC
-#//
-#// JMC_GEN Names of classes to be run through JMC
-#//         Generated .h and .c files go to JMC_GEN_DIR
-#//
-#//------------------------------------------------------------------------
-!if defined(JAVA_OR_NSJVM)
-
-!if defined(JMC_GEN)
-export:: $(JMC_HEADERS)
-
-# Don't delete them if they don't compile (makes it hard to debug)
-.PRECIOUS: $(JMC_HEADERS) $(JMC_STUBS)
-
-
-# They may want to generate/compile the stubs
-!if defined(CCJMC)
-{$(JMC_GEN_DIR)\}.c{$(OBJDIR)\}.obj:
-    @$(CC) @<<$(CFGFILE)
-	-c $(CFLAGS)
-	-I. -I$(JMC_GEN_DIR)
-	-Fd$(PDBFILE)
-	-Fo.\$(OBJDIR)\
-	$(JMC_GEN_DIR)\$(*B).c
-<<KEEP
-
-export:: $(JMC_STUBS) $(OBJDIR) $(JMC_OBJS) 
-
-!endif # CCJMC
-!endif # JMC_GEN
-!endif # JAVA_OR_NSJVM
- 
deleted file mode 100644
--- a/js/jsd/jsd.mak
+++ /dev/null
@@ -1,70 +0,0 @@
-
-PROJ = jsd
-JSD = .
-JS = $(JSD)\..\src
-JSPROJ = js32
-
-!IF "$(BUILD_OPT)" != ""
-OBJ = Release
-CC_FLAGS = /DNDEBUG 
-!ELSE
-OBJ = Debug
-CC_FLAGS = /DDEBUG 
-LINK_FLAGS = /DEBUG
-!ENDIF 
-
-QUIET=@
-
-CFLAGS = /nologo /MDd /W3 /Gm /GX /Zi /Od\
-         /I $(JS)\
-         /I $(JSD)\
-         /DDEBUG /DWIN32 /D_CONSOLE /DXP_WIN /D_WINDOWS /D_WIN32\
-         /DJSDEBUGGER\
-!IF "$(JSD_THREADSAFE)" != ""
-         /DJSD_THREADSAFE\
-!ENDIF 
-         /DEXPORT_JSD_API\
-         $(CC_FLAGS)\
-         /c /Fp$(OBJ)\$(PROJ).pch /Fd$(OBJ)\$(PROJ).pdb /YX -Fo$@ $<
-
-LFLAGS = /nologo /subsystem:console /DLL /incremental:no /machine:I386 \
-         $(LINK_FLAGS) /pdb:$(OBJ)\$(PROJ).pdb -out:$(OBJ)\$(PROJ).dll
-
-LLIBS = kernel32.lib advapi32.lib $(JS)\$(OBJ)\$(JSPROJ).lib
-# unused... user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib                                    
-
-CPP=cl.exe
-LINK32=link.exe
-
-all: $(OBJ) $(OBJ)\$(PROJ).dll
-     
-
-$(OBJ)\$(PROJ).dll:         \
-        $(OBJ)\jsdebug.obj  \
-        $(OBJ)\jsd_atom.obj \
-        $(OBJ)\jsd_high.obj \
-        $(OBJ)\jsd_hook.obj \
-        $(OBJ)\jsd_obj.obj  \
-        $(OBJ)\jsd_scpt.obj \
-        $(OBJ)\jsd_stak.obj \
-        $(OBJ)\jsd_step.obj \
-        $(OBJ)\jsd_text.obj \
-        $(OBJ)\jsd_lock.obj \
-        $(OBJ)\jsd_val.obj 
-  $(QUIET)$(LINK32) $(LFLAGS) $** $(LLIBS)
-
-{$(JSD)}.c{$(OBJ)}.obj :
-  $(QUIET)$(CPP) $(CFLAGS)
-
-$(OBJ) :
-    $(QUIET)mkdir $(OBJ)
-
-clean:
-    @echo deleting old output
-    $(QUIET)del $(OBJ)\*.pch >NUL
-    $(QUIET)del $(OBJ)\*.obj >NUL
-    $(QUIET)del $(OBJ)\*.exp >NUL
-    $(QUIET)del $(OBJ)\*.lib >NUL
-    $(QUIET)del $(OBJ)\*.idb >NUL
-    $(QUIET)del $(OBJ)\*.pdb >NUL
-    $(QUIET)del $(OBJ)\*.dll >NUL
deleted file mode 100644
--- a/js/jsd/jsdshell.mak
+++ /dev/null
@@ -1,112 +0,0 @@
-
-PROJ = jsdshell
-JSD = .
-JSDJAVA = $(JSD)\java
-JS      = $(JSD)\..\src
-RUN         = $(JSD)\run
-JSPROJ      = js32
-JSDPROJ     = jsd
-JSDJAVAPROJ = jsdjava
-
-!IF "$(BUILD_OPT)" != ""
-OPT = BUILD_OPT=1
-OBJ = Release
-CC_FLAGS = /DNDEBUG 
-!ELSE
-OPT = 
-OBJ = Debug
-CC_FLAGS = /DDEBUG 
-LINK_FLAGS = /DEBUG
-!ENDIF 
-
-QUIET=@
-
-CFLAGS = /nologo /MDd /W3 /Gm /GX /Zi /Od\
-         /I $(JS)\
-         /I $(JSD)\
-         /DDEBUG /DWIN32 /D_CONSOLE /DXP_WIN /D_WINDOWS /D_WIN32\
-         /DJSDEBUGGER\
-!IF "$(JSDEBUGGER_JAVA_UI)" != ""
-         /I $(JSDJAVA)\
-         /DJSDEBUGGER_JAVA_UI\
-         /DJSD_STANDALONE_JAVA_VM\
-!ENDIF 
-         /DJSD_LOWLEVEL_SOURCE\
-         /DJSFILE\
-         $(CC_FLAGS)\
-         /c /Fp$(OBJ)\$(PROJ).pch /Fd$(OBJ)\$(PROJ).pdb /YX -Fo$@ $<
-
-LFLAGS = /nologo /subsystem:console /incremental:no /machine:I386 \
-         $(LINK_FLAGS) /pdb:$(OBJ)\$(PROJ).pdb -out:$(OBJ)\$(PROJ).exe
-
-LLIBS = kernel32.lib advapi32.lib \
-        $(JS)\$(OBJ)\$(JSPROJ).lib \
-        $(JSD)\$(OBJ)\$(JSDPROJ).lib \
-        $(JSDJAVA)\$(OBJ)\$(JSDJAVAPROJ).lib
-
-CPP=cl.exe
-LINK32=link.exe
-
-all: $(OBJ) $(RUN) dlls $(OBJ)\$(PROJ).exe copy_binaries
-
-$(OBJ)\$(PROJ).exe:         \
-        $(OBJ)\js.obj
-  $(QUIET)$(LINK32) $(LFLAGS) $** $(LLIBS)
-
-
-{$(JS)}.c{$(OBJ)}.obj :
-  $(QUIET)$(CPP) $(CFLAGS)
-
-dlls :
-    $(QUIET)cd ..\src
-!IF "$(BUILD_OPT)" != ""
-    $(QUIET)nmake -f js.mak CFG="js - Win32 Release"
-!ELSE
-    $(QUIET)nmake -f js.mak CFG="js - Win32 Debug"
-!ENDIF 
-    $(QUIET)cd ..\jsd
-    $(QUIET)nmake -f jsd.mak JSD_THREADSAFE=1 $(OPT)
-    $(QUIET)cd java
-    $(QUIET)nmake -f jsdjava.mak JSD_STANDALONE_JAVA_VM=1 $(OPT)
-    $(QUIET)cd ..
-
-copy_binaries :
-    @echo copying binaries
-    $(QUIET)copy $(JS)\$(OBJ)\$(JSPROJ).dll $(RUN)               >NUL
-    $(QUIET)copy $(JS)\$(OBJ)\$(JSPROJ).pdb $(RUN)               >NUL
-    $(QUIET)copy $(JSD)\$(OBJ)\$(JSDPROJ).dll $(RUN)             >NUL
-    $(QUIET)copy $(JSD)\$(OBJ)\$(JSDPROJ).pdb $(RUN)             >NUL
-    $(QUIET)copy $(JSDJAVA)\$(OBJ)\$(JSDJAVAPROJ).dll $(RUN)     >NUL
-    $(QUIET)copy $(JSDJAVA)\$(OBJ)\$(JSDJAVAPROJ).pdb $(RUN)     >NUL
-    $(QUIET)copy $(OBJ)\$(PROJ).pdb $(RUN)                       >NUL
-    $(QUIET)copy $(OBJ)\$(PROJ).exe $(RUN)                       >NUL
-
-$(OBJ) :
-    $(QUIET)mkdir $(OBJ)
-
-$(RUN) :
-    $(QUIET)mkdir $(RUN)
-
-clean:
-    @echo deleting old output
-    $(QUIET)del $(OBJ)\js.obj >NUL
-    $(QUIET)del $(OBJ)\$(PROJ).pch >NUL
-    $(QUIET)del $(OBJ)\$(PROJ)*.idb >NUL
-    $(QUIET)del $(OBJ)\$(PROJ).pdb >NUL
-    $(QUIET)del $(OBJ)\$(PROJ).exe >NUL
-    $(QUIET)del $(RUN)\*.pdb >NUL
-    $(QUIET)del $(RUN)\*.exe >NUL
-    $(QUIET)del $(RUN)\*.dll >NUL
-
-deep_clean: clean
-    $(QUIET)cd ..\src
-!IF "$(BUILD_OPT)" != ""
-    $(QUIET)nmake -f js.mak CFG="js - Win32 Release" clean
-!ELSE
-    $(QUIET)nmake -f js.mak CFG="js - Win32 Debug" clean
-!ENDIF 
-    $(QUIET)cd ..\jsd
-    $(QUIET)nmake -f jsd.mak clean
-    $(QUIET)cd java
-    $(QUIET)nmake -f jsdjava.mak clean
-    $(QUIET)cd ..