Commit 6d311938 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Complete rewrite of the error code generation script. It now runs as a single 

script, translates function codes better and doesn't need the K&R function
prototypes to work (NB. the K&R prototypes can't be wiped just yet: they are
still needed by the DEF generator...). I also ran the script with the -rewrite
option to update all the header and source files.
parent dd3c43c5

CHANGES

+11 −0
Original line number Diff line number Diff line
@@ -5,6 +5,17 @@ 


 Changes between 0.9.2b and 0.9.3



  *) Complete rewrite of the error code script(s). It is all now handled

     by one script at the top level which handles error code gathering,

     header rewriting and C source file generation. It should be much better

     than the old method: it now uses a modified version of Ulf's parser to

     read the ANSI prototypes in all header files (thus the old K&R definitions

     aren't needed for error creation any more) and do a better job of

     translating function codes into names. The old 'ASN1 error code imbedded

     in a comment' is no longer necessary and it doesn't use .err files which

     have now been deleted.

     [Steve Henson]



  *) Change #include filenames from <foo.h> to <openssl/foo.h>.

     [Bodo Moeller]

Makefile.org

+1 −5
Original line number Diff line number Diff line
@@ -263,11 +263,7 @@ tags: 
	done;



errors:

	@for i in $(DIRS) ;\

	do \

	(cd $$i && echo "making errors in $$i..." && \

	$(MAKE) SDIRS='${SDIRS}' PERL='${PERL}' errors ) || exit 1; \

	done;

	perl util/mkerr.pl -static -recurse



tar:

	@gtar --no-recursion -cvf - \

apps/Makefile.ssl

+0 −2
Original line number Diff line number Diff line
@@ -114,8 +114,6 @@ dclean: 
	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

	mv -f Makefile.new $(MAKEFILE)



errors:



clean:

	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE)

	rm -f req

crypto/Makefile.ssl

+0 −15
Original line number Diff line number Diff line
@@ -141,21 +141,6 @@ dclean: 
	$(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' dclean ); \

	done;



errors: errgen $(ERRC).c



$(ERRC).c: $(ERR).err

	$(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h

	$(PERL) err/err_genc.pl -s $(ERR).h $(ERRC).c



errgen:

	$(PERL) ./err/err_code.pl -conf err/ssleay.ec *.c */*.c ../ssl/*.c ../rsaref/*.c

	@for i in $(SDIRS) ;\

	do \

	(cd $$i; echo "making errors in crypto/$$i..."; \

	$(MAKE) errors ); \

	done;





# DO NOT DELETE THIS LINE -- make depend depends on it.



cpt_err.o: ../include/openssl/crypto.h ../include/openssl/err.h

crypto/asn1/Makefile.ssl

+0 −5
Original line number Diff line number Diff line
@@ -112,11 +112,6 @@ dclean: 
clean:

	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff



errors: $(ERRC).c



$(ERRC).c: $(ERR).err

	$(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h

	$(PERL) ../err/err_genc.pl -s $(ERR).h $(ERRC).c



# DO NOT DELETE THIS LINE -- make depend depends on it.