From a1c5402dab41e8b5ec0f0b9e57b17e4d43657f2d Mon Sep 17 00:00:00 2001 From: "fur%netscape.com" Date: Wed, 23 Dec 1998 20:12:59 +0000 Subject: [PATCH] Closer to building packages again in the new mozilla world. --- .../winbuild/ElectricalFire.dsw | 139 -------- .../winbuild/Package/Package.dsp | 336 ++---------------- .../winbuild/electricalfire.dsp | 24 +- 3 files changed, 44 insertions(+), 455 deletions(-) diff --git a/ef/Driver/StandAloneJava/winbuild/ElectricalFire.dsw b/ef/Driver/StandAloneJava/winbuild/ElectricalFire.dsw index 1897a4436fc..e69de29bb2d 100644 --- a/ef/Driver/StandAloneJava/winbuild/ElectricalFire.dsw +++ b/ef/Driver/StandAloneJava/winbuild/ElectricalFire.dsw @@ -1,139 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "Burg"=.\Burg\Burg.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "DebuggerChannel"=.\DebuggerChannel.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "NADGrammar"=..\..\..\Tools\Nad\NADGrammar\winbuild\NADGrammar.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "Package"=.\Package\Package.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name electricalfire - End Project Dependency -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name javah - End Project Dependency -}}} - -############################################################################### - -Project: "electricalfire"=.\electricalfire.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Burg - End Project Dependency -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name DebuggerChannel - End Project Dependency -}}} - -############################################################################### - -Project: "furmon"=..\..\..\Tools\Monitor\winbuild\furmon.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "javah"=.\javah.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name electricalfire - End Project Dependency -}}} - -############################################################################### - -Project: "sajava"=.\sajava.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name electricalfire - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/ef/Driver/StandAloneJava/winbuild/Package/Package.dsp b/ef/Driver/StandAloneJava/winbuild/Package/Package.dsp index 47ad381d075..facc0640732 100644 --- a/ef/Driver/StandAloneJava/winbuild/Package/Package.dsp +++ b/ef/Driver/StandAloneJava/winbuild/Package/Package.dsp @@ -218,201 +218,44 @@ SOURCE=..\..\..\..\Packages\java\util\nativesrc\ResourceBundle.cpp # End Source File # End Group # End Group -# Begin Group "GeneratedFiles" - -# PROP Default_Filter "" # Begin Source File -SOURCE=..\..\..\..\Packages\java\io\nativesrc\geninclude\java_io_File.h -# End Source File -# Begin Source File - -SOURCE=\ -..\..\..\..\Packages\java\io\nativesrc\geninclude\java_io_FileDescriptor.h -# End Source File -# Begin Source File - -SOURCE=\ -..\..\..\..\Packages\java\io\nativesrc\geninclude\java_io_FileInputStream.h -# End Source File -# Begin Source File - -SOURCE=\ -..\..\..\..\Packages\java\io\nativesrc\geninclude\java_io_FileOutputStream.h -# End Source File -# Begin Source File - -SOURCE=\ -..\..\..\..\Packages\java\io\nativesrc\geninclude\java_io_FilterOutputStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\Packages\java\io\nativesrc\geninclude\java_io_InputStream.h -# End Source File -# Begin Source File - -SOURCE=\ -..\..\..\..\Packages\java\io\nativesrc\geninclude\java_io_ObjectInputStream.h -# End Source File -# Begin Source File - -SOURCE=\ -..\..\..\..\Packages\java\io\nativesrc\geninclude\java_io_ObjectStreamClass.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\Packages\java\io\nativesrc\geninclude\java_io_OutputStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\Packages\java\io\nativesrc\geninclude\java_io_PrintStream.h -# End Source File -# Begin Source File - -SOURCE=\ -..\..\..\..\Packages\java\io\nativesrc\geninclude\java_io_RandomAccessFile.h -# End Source File -# Begin Source File - -SOURCE=\ -..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_ArithmeticException.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Class.h -# End Source File -# Begin Source File - -SOURCE=\ -..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_ClassLoader.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Compiler.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Double.h -# End Source File -# Begin Source File - -SOURCE=\ -..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Exception.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Float.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Math.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Number.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Object.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Runtime.h -# End Source File -# Begin Source File - -SOURCE=\ -..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_RuntimeException.h -# End Source File -# Begin Source File - -SOURCE=\ -..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_SecurityManager.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_String.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_System.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Thread.h -# End Source File -# Begin Source File - -SOURCE=\ -..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Throwable.h -# End Source File -# Begin Source File - -SOURCE=\ -..\..\..\..\Packages\java\security\nativesrc\geninclude\java_security_AccessController.h -# End Source File -# Begin Source File - -SOURCE=\ -..\..\..\..\Packages\java\security\nativesrc\geninclude\java_security_ProtectionDomain.h -# End Source File -# Begin Source File - -SOURCE=\ -..\..\..\..\Packages\java\util\nativesrc\geninclude\java_util_ResourceBundle.h -# End Source File -# End Group -# Begin Source File - -SOURCE=..\..\..\..\..\dist\classes\java\security\AccessController.class +SOURCE=..\..\..\..\Packages\rt.jar !IF "$(CFG)" == "Package - Win32 Release" -# Begin Custom Build -InputPath=..\..\..\..\..\dist\classes\java\security\AccessController.class - -"..\..\..\..\Packages\java\lsecurity\nativesrc\geninclude\ProtectionDomain.h" :\ - $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - ..\release\javah -classpath ../../../../../dist/classes -d\ - ../../../../Packages/java/security/nativesrc/geninclude\ - java/security/AccessController java/security/ProtectionDomain - -# End Custom Build - !ELSEIF "$(CFG)" == "Package - Win32 Debug" -# Begin Custom Build -InputPath=..\..\..\..\..\dist\classes\java\security\AccessController.class - -"..\..\..\..\Packages\java\lsecurity\nativesrc\geninclude\ProtectionDomain.h" :\ - $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - ..\electric\javah -classpath ../../../../../dist/classes -d\ - ../../../../Packages/java/security/nativesrc/geninclude\ - java/security/AccessController java/security/ProtectionDomain - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\..\dist\classes\java\lang\Class.class - -!IF "$(CFG)" == "Package - Win32 Release" - -# Begin Custom Build - Generating Header files for java/lang -InputPath=..\..\..\..\..\dist\classes\java\lang\Class.class +# Begin Custom Build - Generating C header files from Java sources +InputPath=..\..\..\..\Packages\rt.jar BuildCmds= \ - ..\release\javah -classpath ../../../../../dist/classes -d\ - ../../../../Packages/java/lang/nativesrc/geninclude\ - java/lang/ArithmeticException java/lang/Character java/lang/Class\ - java/lang/ClassLoader java/lang/Compiler java/lang/Double java/lang/Float\ - java/lang/Math java/lang/Runtime java/lang/SecurityManager\ - java/lang/System java/lang/String java/lang/Thread\ - java/lang/reflect/Field java/lang/reflect/Method java/lang/reflect/Constructor\ - java/lang/reflect/Array java/util/Properties + ..\electric\javah -classpath ../../../../Packages/rt.jar -d\ + ../../../../Packages/java/security/nativesrc/geninclude\ + java/security/AccessController java/security/ProtectionDomain \ + ..\electric\javah -classpath ../../../../Packages/rt.jar -d\ + ../../../../Packages/java/lang/nativesrc/geninclude\ + java/lang/ArithmeticException java/lang/Character java/lang/Class\ + java/lang/ClassLoader java/lang/Compiler java/lang/Double java/lang/Float\ + java/lang/Math java/lang/Runtime java/lang/SecurityManager\ + java/lang/System java/lang/String java/lang/Thread\ + java/lang/reflect/Field java/lang/reflect/Method java/lang/reflect/Constructor\ + java/lang/reflect/Array java/util/Properties \ + ..\electric\javah -classpath ../../../../Packages/rt.jar -d\ + ../../../../Packages/java/io/nativesrc/geninclude java/io/File\ + java/io/FileDescriptor java/io/FileInputStream java/io/FileOutputStream\ + java/io/PrintStream java/io/RandomAccessFile \ + ..\electric\javah -classpath ../../../../Packages/rt.jar -d\ + ../../../../Packages/java/util/nativesrc/geninclude java/util/ResourceBundle \ + + +"..\..\..\..\Packages\java\security\nativesrc\geninclude\ProtectionDomain.h" : \ +$(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"..\..\..\..\Packages\java\security\nativesrc\geninclude\java_lang_Object.h" : \ +$(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) "..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Class.h" : \ $(SOURCE) "$(INTDIR)" "$(OUTDIR)" @@ -438,6 +281,10 @@ $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) +"..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Object.h" : \ +$(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + "..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Runtime.h" : \ $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) @@ -469,97 +316,6 @@ $(SOURCE) "$(INTDIR)" "$(OUTDIR)" "..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_util_properties.h" : \ $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "Package - Win32 Debug" - -# Begin Custom Build - Generating Header files for java/lang -InputPath=..\..\..\..\..\dist\classes\java\lang\Class.class - -BuildCmds= \ - ..\electric\javah -classpath ../../../../../dist/classes -d\ - ../../../../Packages/java/lang/nativesrc/geninclude\ - java/lang/ArithmeticException java/lang/Character java/lang/Class\ - java/lang/ClassLoader java/lang/Compiler java/lang/Double java/lang/Float\ - java/lang/Math java/lang/Runtime java/lang/SecurityManager\ - java/lang/System java/lang/String java/lang/Thread\ - java/lang/reflect/Field java/lang/reflect/Method java/lang/reflect/Constructor\ - java/lang/reflect/Array java/util/Properties - -"..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Class.h" : \ -$(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_ClassLoader.h" :\ - $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Compiler.h" : \ -$(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Double.h" : \ -$(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Float.h" : \ -$(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Math.h" : \ -$(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Runtime.h" : \ -$(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_System.h" : \ -$(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_String.h" : \ -$(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Thread.h" : \ -$(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Number.h" : \ -$(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Ref.h" : \ -$(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_lang_Exception.h" : \ -$(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\..\..\..\Packages\java\lang\nativesrc\geninclude\java_util_properties.h" : \ -$(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\..\dist\classes\java\io\File.class - -!IF "$(CFG)" == "Package - Win32 Release" - -# Begin Custom Build - Generating Header files for java/io -InputPath=..\..\..\..\..\dist\classes\java\io\File.class - -BuildCmds= \ - ..\release\javah -classpath ../../../../../dist/classes -d\ - ../../../../Packages/java/io/nativesrc/geninclude java/io/File\ - java/io/FileDescriptor java/io/FileInputStream java/io/FileOutputStream\ - java/io/PrintStream java/io/RandomAccessFile "..\..\..\..\Packages\java\io\nativesrc\geninclude\java_io_File.h" : $(SOURCE)\ "$(INTDIR)" "$(OUTDIR)" @@ -569,27 +325,7 @@ BuildCmds= \ $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) -"..\..\..\..\Packages\java\io\nativesrc\geninclude\java_io_FileInputStream.h" :\ - $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "Package - Win32 Debug" - -# Begin Custom Build - Generating Header files for java/io -InputPath=..\..\..\..\..\dist\classes\java\io\File.class - -BuildCmds= \ - ..\electric\javah -classpath ../../../../../dist/classes -d\ - ../../../../Packages/java/io/nativesrc/geninclude java/io/File\ - java/io/FileDescriptor java/io/FileInputStream java/io/FileOutputStream\ - java/io/PrintStream java/io/RandomAccessFile - -"..\..\..\..\Packages\java\io\nativesrc\geninclude\java_io_File.h" : $(SOURCE)\ - "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\..\..\..\Packages\java\io\nativesrc\geninclude\java_io_FileDescriptor.h" : \ +"..\..\..\..\Packages\java\io\nativesrc\geninclude\java_lang_Object.h" : \ $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) @@ -600,10 +336,6 @@ $(SOURCE) "$(INTDIR)" "$(OUTDIR)" !ENDIF -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\..\dist\classes\java\util\ResourceBundle.class # End Source File # End Target # End Project diff --git a/ef/Driver/StandAloneJava/winbuild/electricalfire.dsp b/ef/Driver/StandAloneJava/winbuild/electricalfire.dsp index c37eaf23c8a..553ce9be44e 100644 --- a/ef/Driver/StandAloneJava/winbuild/electricalfire.dsp +++ b/ef/Driver/StandAloneJava/winbuild/electricalfire.dsp @@ -768,10 +768,10 @@ InputName=x86-win32 BuildCmds= \ $(NSTOOLS)\perl5\perl ..\..\..\tools\nad\nad.pl $(InputPath)\ - ..\..\..\Compiler\PrimitiveGraph\PrimitiveOperations\ - genfiles\PrimitiveOperations.h genfiles\PrimitiveOperations.cpp\ - genfiles\$(InputName).nad.burg.h | Burg\Release\burg -I >\ - genfiles\$(InputName).nad.burg.cpp + ..\..\..\Compiler\PrimitiveGraph\PrimitiveOperations\ + genfiles\PrimitiveOperations.h genfiles\PrimitiveOperations.cpp\ + genfiles\$(InputName).nad.burg.h | Burg\Release\burg -I >\ + genfiles\$(InputName).nad.burg.cpp "genfiles\$(InputName).nad.burg.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) @@ -794,10 +794,10 @@ InputName=x86-win32 BuildCmds= \ $(MOZ_TOOLS)\perl5\perl ..\..\..\tools\nad\nad.pl $(InputPath)\ - ..\..\..\Compiler\PrimitiveGraph\PrimitiveOperations\ - genfiles\PrimitiveOperations.h genfiles\PrimitiveOperations.cpp\ - genfiles\$(InputName).nad.burg.h | Burg\Debug\burg -I >\ - genfiles\$(InputName).nad.burg.cpp + ..\..\..\Compiler\PrimitiveGraph\PrimitiveOperations\ + genfiles\PrimitiveOperations.h genfiles\PrimitiveOperations.cpp\ + genfiles\$(InputName).nad.burg.h | Burg\Debug\burg -I >\ + genfiles\$(InputName).nad.burg.cpp "genfiles\$(InputName).nad.burg.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) @@ -1079,8 +1079,8 @@ InputName=PrimitiveOperations BuildCmds= \ $(MOZ_TOOLS)\perl5\perl -I"..\..\..\Tools\PrimitiveOperations"\ - ..\..\..\Tools\PrimitiveOperations\MakePrimOp.pl $(InputPath)\ - genfiles\$(InputName).h genfiles\$(InputName).cpp + ..\..\..\Tools\PrimitiveOperations\MakePrimOp.pl $(InputPath)\ + genfiles\$(InputName).h genfiles\$(InputName).cpp "genfiles\$(InputName).h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) @@ -1131,10 +1131,6 @@ SOURCE=..\..\..\Debugger\Debugger.h # End Source File # Begin Source File -SOURCE=..\..\..\Debugger\jvmdi.cpp -# End Source File -# Begin Source File - SOURCE=..\..\..\Debugger\jvmdi.h # End Source File # Begin Source File