From 9034271912de025692c4dcfd56d34da0b8d98e99 Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Thu, 17 May 2007 15:05:56 +0000 Subject: [PATCH] updates. --- CHANGES | 5 + lib/doc/LIBINDEX | 6 - lib/doc/building.html | 7 + win32/clean_dist.pl | 307 +++++++++++++++++++----------------------- 4 files changed, 154 insertions(+), 171 deletions(-) diff --git a/CHANGES b/CHANGES index 7c04603f..268d7047 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +Thu May 17 18:05:10 EEST 2007 Pekka Riikonen + + * Fixed silc_show_public_key to not free public key in case of + failure. Affected file is lib/silcapputil/silcapputil.c. + Thu May 17 17:09:50 EEST 2007 Pekka Riikonen * SILC Toolkit 1.1 Beta3. diff --git a/lib/doc/LIBINDEX b/lib/doc/LIBINDEX index f4a661b3..22c358c1 100644 --- a/lib/doc/LIBINDEX +++ b/lib/doc/LIBINDEX @@ -10,12 +10,6 @@ Version: @VERSION@
Copyright © 1997 - 2007 The SILC Project
Updated: @DATE@ -


-NOTE: This is reference manual of alpha version of SILC Toolkit 1.1 and -the reference may be incomplete, inaccurate and document nonexistent APIs. -The APIs provided by alpha versions of SILC Toolkit 1.1 may not be stable yet. - -


Welcome to the SILC Toolkit Reference Manual. The manual is a complete developer guide and reference for the SILC application programmer. The manual diff --git a/lib/doc/building.html b/lib/doc/building.html index 4415d45f..44a66456 100644 --- a/lib/doc/building.html +++ b/lib/doc/building.html @@ -17,6 +17,7 @@ README.MACOSX for building on Mac OS X.
  • Building on Unix & Linux
  • Building on Windows
  • Building on Mac OS X +
  • Building on Symbian OS
     
     
    Building on Unix & Linux @@ -185,3 +186,9 @@ the command:
     
    make install + +
     
     
    +Building on Symbian OS + +Please read the README.SYMBIAN from the SILC Toolkit package for building +instructions. diff --git a/win32/clean_dist.pl b/win32/clean_dist.pl index fe10fba9..809c9ce4 100644 --- a/win32/clean_dist.pl +++ b/win32/clean_dist.pl @@ -1,165 +1,142 @@ -#!/usr/bin/perl - -$p = `pwd`; - -if($p =~ /.*(\/win32)/) -{ - @dirents = split('/', $p); - if(@dirents > 2) - { - # check dependencies - print "Checking dependencies\n"; - @statLibSilcDllDebug = stat("libsilc/Debug/libsilc.dll"); - @statLibSilcExpDebug = stat("libsilc/Debug/libsilc.exp"); - @statLibSilcLibDebug = stat("libsilc/Debug/libsilc.lib"); - if(! @statLibSilcDllDebug || ! @statLibSilcExpDebug || ! @statLibSilcLibDebug) - { - die "Please rebuild libsilc Debug before creating the distribution\n"; - } - - @statLibSilcDllRelease = stat("libsilc/Release/libsilc.dll"); - @statLibSilcExpRelease = stat("libsilc/Release/libsilc.exp"); - @statLibSilcLibRelease = stat("libsilc/Release/libsilc.lib"); - if(! @statLibSilcDllRelease || ! @statLibSilcExpRelease || ! @statLibSilcLibRelease) - { - die "Please rebuild libsilc Release before creating the distribution\n"; - } - - @statLibSilcClientDllDebug = stat("libsilcclient/Debug/libsilcclient.dll"); - @statLibSilcClientExpDebug = stat("libsilcclient/Debug/libsilcclient.exp"); - @statLibSilcClientLibDebug = stat("libsilcclient/Debug/libsilcclient.lib"); - if(! @statLibSilcClientDllDebug || - ! @statLibSilcClientExpDebug || - ! @statLibSilcClientLibDebug || - (@statLibSilcClientDllDebug[9] < @statLibSilcDllDebug[9]) || - (@statLibSilcClientExpDebug[9] < @statLibSilcExpDebug[9]) || - (@statLibSilcClientLibDebug[9] < @statLibSilcLibDebug[9]) - ) - { - die "Please rebuild libsilcclient Debug before creating the distribution\n"; - } - - @statLibSilcClientDllRelease = stat("libsilcclient/Release/libsilcclient.dll"); - @statLibSilcClientExpRelease = stat("libsilcclient/Release/libsilcclient.exp"); - @statLibSilcClientLibRelease = stat("libsilcclient/Release/libsilcclient.lib"); - if(! @statLibSilcClientDllRelease || - ! @statLibSilcClientExpRelease || - ! @statLibSilcClientLibRelease || - (@statLibSilcClientDllRelease[9] < @statLibSilcDllRelease[9]) || - (@statLibSilcClientExpRelease[9] < @statLibSilcExpRelease[9]) || - (@statLibSilcClientLibRelease[9] < @statLibSilcLibRelease[9]) - ) - { - die "Please rebuild libsilcclient Release before creating the distribution\n"; - } - - @statLibSilcStaticLibDebug = stat("libsilc_static/Debug/libsilc_static.lib"); - if(! @statLibSilcStaticLibDebug) - { - die "Please rebuild libsilc_static Debug before creating the distribution\n"; - } - - @statLibSilcStaticLibRelease = stat("libsilc_static/Release/libsilc_static.lib"); - if(! @statLibSilcStaticLibRelease) - { - die "Please rebuild libsilc_static Release before creating the distribution\n"; - } - - @statLibSilcClientStaticLibDebug = stat("libsilcclient_static/Debug/libsilcclient_static.lib"); - if(! @statLibSilcClientStaticLibDebug || (@statLibSilcClientStaticLibDebug[9] < @statLibSilcStaticLibDebug[9])) - { - die "Please rebuild libsilcclient_static Debug before creating the distribution\n"; - } - - @statLibSilcClientStaticLibRelease = stat("libsilcclient_static/Release/libsilcclient_static.lib"); - if(! @statLibSilcClientStaticLibRelease || (@statLibSilcClientStaticLibRelease[9] < @statLibSilcStaticLibRelease[9])) - { - die "Please rebuild libsilcclient_static Release before creating the distribution\n"; - } - - $index = @dirents - 2; - $top = @dirents[$index]; - `find . -name \"*.obj\" -exec rm -f \\{} \\;`; - `find . -name \"*.idb\" -exec rm -f \\{} \\;`; - `find . -name \"*.pdb\" -exec rm -f \\{} \\;`; - `find . -name \"*.pch\" -exec rm -f \\{} \\;`; - `find ../ -name \"*.o\" -exec rm -f \\{} \\;`; - `find ../ -name \"*.lo\" -exec rm -f \\{} \\;`; - `find ../ -name \"*.a\" -exec rm -f \\{} \\;`; - `find ../ -name \"*.la\" -exec rm -f \\{} \\;`; - `find ../ -name \"*.lai\" -exec rm -f \\{} \\;`; - - push(@excludeList, "--exclude $top/win32/Debug"); - push(@excludeList, "--exclude $top/win32/libsilc/CVS"); - push(@excludeList, "--exclude $top/win32/libsilc/libsilc.plg"); - push(@excludeList, "--exclude $top/win32/libsilcclient/CVS"); - push(@excludeList, "--exclude $top/win32/libsilcclient/libsilcclient.plg"); - push(@excludeList, "--exclude $top/win32/libsilc_static/CVS"); - push(@excludeList, "--exclude $top/win32/libsilc_static/libsilc_static.plg"); - push(@excludeList, "--exclude $top/win32/libsilcclient_static/CVS"); - push(@excludeList, "--exclude $top/win32/libsilcclient_static/libsilcclient_static.plg"); - push(@excludeList, "--exclude $top/win32/silc.ncb"); - push(@excludeList, "--exclude $top/includes/CVS"); - push(@excludeList, "--exclude $top/lib/silcutil/win32/.cvsignore"); - push(@excludeList, "--exclude $top/lib/silcutil/win32/CVS"); - push(@excludeList, "--exclude $top/win32/all.plg"); - push(@excludeList, "--exclude $top/win32/buildDistAfterAllReleaseAndDebug.plg"); - push(@excludeList, "--exclude $top/win32/CVS"); - push(@excludeList, "--exclude $top/win32/tests/CVS"); - push(@excludeList, "--exclude $top/win32/libsilc/Debug/libsilc.ilk"); - push(@excludeList, "--exclude $top/win32/libsilc/Debug/libsilc.pdb"); - push(@excludeList, "--exclude $top/win32/libsilcclient/Debug/libsilcclient.ilk"); - push(@excludeList, "--exclude $top/win32/libsilcclient/Debug/libsilcclient.pdb"); - push(@excludeList, "--exclude $top/win32/libsilc/Release/libsilc.ilk"); - push(@excludeList, "--exclude $top/win32/libsilc/Release/libsilc.pdb"); - push(@excludeList, "--exclude $top/win32/libsilcclient/Release/libsilcclient.ilk"); - push(@excludeList, "--exclude $top/win32/silc.opt"); - push(@excludeList, "--exclude $top/irssi"); - push(@excludeList, "--exclude $top/doc/CVS"); - push(@excludeList, "--exclude $top/doc/examples/CVS"); - push(@excludeList, "--exclude $top/lib/doc/CVS"); - push(@excludeList, "--exclude $top/lib/silcclient/.libs"); - push(@excludeList, "--exclude $top/lib/silccore/.libs"); - push(@excludeList, "--exclude $top/lib/silccore/tests/CVS"); - push(@excludeList, "--exclude $top/lib/silccrypt/.libs"); - push(@excludeList, "--exclude $top/lib/silccrypt/tests/CVS"); - push(@excludeList, "--exclude $top/lib/silcmath/.libs"); - push(@excludeList, "--exclude $top/lib/silcmath/mpi/.libs"); - push(@excludeList, "--exclude $top/lib/silcsftp/.libs"); - push(@excludeList, "--exclude $top/lib/silcsftp/tests/CVS"); - push(@excludeList, "--exclude $top/lib/silcsim/.libs"); - push(@excludeList, "--exclude $top/lib/silcske/.libs"); - push(@excludeList, "--exclude $top/lib/silcutil/.libs"); - push(@excludeList, "--exclude $top/lib/silcutil/win32/.libs"); - push(@excludeList, "--exclude $top/silcer/CVS"); - push(@excludeList, "--exclude $top/silcer/intl/CVS"); - push(@excludeList, "--exclude $top/silcer/macros/CVS"); - push(@excludeList, "--exclude $top/silcer/pixmaps/CVS"); - push(@excludeList, "--exclude $top/silcer/po/CVS"); - push(@excludeList, "--exclude $top/silcer/src/CVS"); - push(@excludeList, "--exclude $top/silcer/ui/CVS"); - push(@excludeList, "--exclude $top/tutorial/CVS"); - push(@excludeList, "--exclude $top/tutorial/mybot/CVS"); - - - - $excludes = ""; - foreach $entry(@excludeList) - { - $excludes = sprintf("%s%s ", $excludes, $entry); - } - - print "Copying headers\n"; - `rm -rf include`; - `mkdir -p include`; - `find ../includes -name \"*.h\" -exec cp \\{} include \\;`; - `find ../lib -name \"*.h\" -exec cp \\{} include \\;`; - print "Creating distribution archive.\n"; - `cd ../.. ; tar $excludes -zcvf $top-win32.tgz $top/*` || die "Failed to create distribution\n"; - } -} -else -{ - die "Please run $0 from the win32 directory of the silc distribution\n"; -} - +#!/usr/bin/perl + +$p = `pwd`; + +if($p =~ /.*(\/win32)/) +{ + @dirents = split('/', $p); + if(@dirents > 2) + { + # check dependencies + print "Checking dependencies\n"; + @statLibSilcDllDebug = stat("libsilc/Debug/libsilc.dll"); + @statLibSilcExpDebug = stat("libsilc/Debug/libsilc.exp"); + @statLibSilcLibDebug = stat("libsilc/Debug/libsilc.lib"); + if(! @statLibSilcDllDebug || ! @statLibSilcExpDebug || ! @statLibSilcLibDebug) + { + die "Please rebuild libsilc Debug before creating the distribution\n"; + } + + @statLibSilcDllRelease = stat("libsilc/Release/libsilc.dll"); + @statLibSilcExpRelease = stat("libsilc/Release/libsilc.exp"); + @statLibSilcLibRelease = stat("libsilc/Release/libsilc.lib"); + if(! @statLibSilcDllRelease || ! @statLibSilcExpRelease || ! @statLibSilcLibRelease) + { + die "Please rebuild libsilc Release before creating the distribution\n"; + } + + @statLibSilcClientDllDebug = stat("libsilcclient/Debug/libsilcclient.dll"); + @statLibSilcClientExpDebug = stat("libsilcclient/Debug/libsilcclient.exp"); + @statLibSilcClientLibDebug = stat("libsilcclient/Debug/libsilcclient.lib"); + if(! @statLibSilcClientDllDebug || + ! @statLibSilcClientExpDebug || + ! @statLibSilcClientLibDebug || + (@statLibSilcClientDllDebug[9] < @statLibSilcDllDebug[9]) || + (@statLibSilcClientExpDebug[9] < @statLibSilcExpDebug[9]) || + (@statLibSilcClientLibDebug[9] < @statLibSilcLibDebug[9]) + ) + { + die "Please rebuild libsilcclient Debug before creating the distribution\n"; + } + + @statLibSilcClientDllRelease = stat("libsilcclient/Release/libsilcclient.dll"); + @statLibSilcClientExpRelease = stat("libsilcclient/Release/libsilcclient.exp"); + @statLibSilcClientLibRelease = stat("libsilcclient/Release/libsilcclient.lib"); + if(! @statLibSilcClientDllRelease || + ! @statLibSilcClientExpRelease || + ! @statLibSilcClientLibRelease || + (@statLibSilcClientDllRelease[9] < @statLibSilcDllRelease[9]) || + (@statLibSilcClientExpRelease[9] < @statLibSilcExpRelease[9]) || + (@statLibSilcClientLibRelease[9] < @statLibSilcLibRelease[9]) + ) + { + die "Please rebuild libsilcclient Release before creating the distribution\n"; + } + + @statLibSilcStaticLibDebug = stat("libsilc_static/Debug/libsilc_static.lib"); + if(! @statLibSilcStaticLibDebug) + { + die "Please rebuild libsilc_static Debug before creating the distribution\n"; + } + + @statLibSilcStaticLibRelease = stat("libsilc_static/Release/libsilc_static.lib"); + if(! @statLibSilcStaticLibRelease) + { + die "Please rebuild libsilc_static Release before creating the distribution\n"; + } + + @statLibSilcClientStaticLibDebug = stat("libsilcclient_static/Debug/libsilcclient_static.lib"); + if(! @statLibSilcClientStaticLibDebug || (@statLibSilcClientStaticLibDebug[9] < @statLibSilcStaticLibDebug[9])) + { + die "Please rebuild libsilcclient_static Debug before creating the distribution\n"; + } + + @statLibSilcClientStaticLibRelease = stat("libsilcclient_static/Release/libsilcclient_static.lib"); + if(! @statLibSilcClientStaticLibRelease || (@statLibSilcClientStaticLibRelease[9] < @statLibSilcStaticLibRelease[9])) + { + die "Please rebuild libsilcclient_static Release before creating the distribution\n"; + } + + $index = @dirents - 2; + $top = @dirents[$index]; + `find . -name \"*.obj\" -exec rm -f \\{} \\;`; + `find . -name \"*.idb\" -exec rm -f \\{} \\;`; + `find . -name \"*.pdb\" -exec rm -f \\{} \\;`; + `find . -name \"*.pch\" -exec rm -f \\{} \\;`; + `find ../ -name \"*.o\" -exec rm -f \\{} \\;`; + `find ../ -name \"*.lo\" -exec rm -f \\{} \\;`; + `find ../ -name \"*.a\" -exec rm -f \\{} \\;`; + `find ../ -name \"*.la\" -exec rm -f \\{} \\;`; + `find ../ -name \"*.lai\" -exec rm -f \\{} \\;`; + + push(@excludeList, "--exclude $top/win32/Debug"); + push(@excludeList, "--exclude $top/win32/libsilc/CVS"); + push(@excludeList, "--exclude $top/win32/libsilc/libsilc.plg"); + push(@excludeList, "--exclude $top/win32/libsilcclient/CVS"); + push(@excludeList, "--exclude $top/win32/libsilcclient/libsilcclient.plg"); + push(@excludeList, "--exclude $top/win32/libsilc_static/CVS"); + push(@excludeList, "--exclude $top/win32/libsilc_static/libsilc_static.plg"); + push(@excludeList, "--exclude $top/win32/libsilcclient_static/CVS"); + push(@excludeList, "--exclude $top/win32/libsilcclient_static/libsilcclient_static.plg"); + push(@excludeList, "--exclude $top/win32/silc.ncb"); + push(@excludeList, "--exclude $top/win32/all.plg"); + push(@excludeList, "--exclude $top/win32/buildDistAfterAllReleaseAndDebug.plg"); + push(@excludeList, "--exclude $top/win32/CVS"); + push(@excludeList, "--exclude $top/win32/tests/CVS"); + push(@excludeList, "--exclude $top/win32/libsilc/Debug/libsilc.ilk"); + push(@excludeList, "--exclude $top/win32/libsilc/Debug/libsilc.pdb"); + push(@excludeList, "--exclude $top/win32/libsilcclient/Debug/libsilcclient.ilk"); + push(@excludeList, "--exclude $top/win32/libsilcclient/Debug/libsilcclient.pdb"); + push(@excludeList, "--exclude $top/win32/libsilc/Release/libsilc.ilk"); + push(@excludeList, "--exclude $top/win32/libsilc/Release/libsilc.pdb"); + push(@excludeList, "--exclude $top/win32/libsilcclient/Release/libsilcclient.ilk"); + push(@excludeList, "--exclude $top/win32/silc.opt"); + push(@excludeList, "--exclude $top/win32/tests"); + push(@excludeList, "--exclude $top/apps"); + push(@excludeList, "--exclude $top/doc/CVS"); + push(@excludeList, "--exclude $top/doc/examples/CVS"); + push(@excludeList, "--exclude $top/includes/CVS"); + push(@excludeList, "--exclude $top/lib"); + push(@excludeList, "--exclude $top/tutorial/CVS"); + push(@excludeList, "--exclude $top/tutorial/mybot/CVS"); + + $excludes = ""; + foreach $entry(@excludeList) + { + $excludes = sprintf("%s%s ", $excludes, $entry); + } + + print "Copying headers\n"; + `rm -rf include`; + `mkdir -p include`; + `find ../includes -name \"*.h\" -exec cp \\{} include \\;`; + `find ../lib -name \"*.h\" -exec cp \\{} include \\;`; + print "Creating distribution archive.\n"; + `cd ../.. ; tar $excludes -zcvf $top-win32.tgz $top/*` || die "Failed to create distribution\n"; + } +} +else +{ + die "Please run $0 from the win32 directory of the silc distribution\n"; +} + -- 2.24.0