[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[patch] mail-nightly-build.py - smpt auth and stuff.

From: Carl Karsten <carl_at_personnelware.com>
Date: 2005-06-11 00:33:06 CEST

Now I see the problem fixing 2+ things at the same time, so if you want me to spit
them up, I will. - Carl K

1. mail-nightly-build.py does smtp auth if ID is set.

2. mail-nightly-build.py does pulls server, from, and smtp auth ID/password from
OS environment vars.

3. config-build.bat SETs server, from, and smtp auth ID/password OS environment vars.

4. config-build.bat replaced all D: with %DRIVE%:
There are still D:'s in at least one of the .bat's, but at least not in the config
file.

5. config-build.bat updated all the paths to the defaults of the current version
(like PYTHONDIR=C:\Python23 to C:\Python24)

Index: mail-nightly-build.py
===================================================================
--- mail-nightly-build.py (revision 340)
+++ mail-nightly-build.py (working copy)
@@ -9,13 +9,13 @@
  # Usage: mail-nightly-build.py SUBJECT FILENAME
  # mails the contents of FILENAME to svn-breakage@ list.

-# Adjust these globals as needed:
-
  to_address = "svn-breakage@subversion.tigris.org"
-# to_address = "ehuels@gmail.com"
-from_address = "sussman@collab.net"
-SMTP_server = "mail.speakeasy.net"

+from_address = "%s <%s>" % (os.environ["computername"], os.environ["from_address"] )
+SMTP_server = os.environ["SMTP_server"]
+SMTP_auth_ID = os.environ["SMTP_auth_ID"]
+SMTP_auth_pwd = os.environ["SMTP_auth_pwd"]
+
  # The huuuuuuuuuuge program:

  if len(sys.argv) < 3:
@@ -53,5 +53,7 @@
                               base64.encodestring(contents), mime_boundary)

  server = smtplib.SMTP(SMTP_server)
+if SMTP_auth_ID:
+ server.login( SMTP_auth_ID, SMTP_auth_pwd )
  server.sendmail(from_address, to_address, msg)
  server.quit()

Index: config-build.bat
===================================================================
--- config-build.bat (revision 336)
+++ config-build.bat (working copy)
@@ -10,14 +10,16 @@
  SET VER=%1
  SET DIR=%2
  SET DRIVE=D
-SET HTTPD=2.0.54-db-4.3
+rem SET HTTPD=2.0.54-db-4.3
+SET HTTPD=2.0.54
+
  SET BUILD_TYPE=Release

  IF "%VER%"=="" SET VER=trunk
  IF "%DIR%"=="" SET DIR=trunk

  REM **** Project directory
-SET PD=D:\svnbuild
+SET PD=%DRIVE%:\svnbuild
  SET SRC=%PD%\src-%DIR%

  REM **** Dependency paths
@@ -28,42 +30,48 @@
  SET LIBINTLINC=%PD%\svn-win32-libintl\include
  SET LIBINTLLIB=%PD%\svn-win32-libintl\lib
  SET LIBINTLBIN=%PD%\gettext\bin
-SET JAVADIR=D:\Java\jdk1.5.0_01
+SET JAVADIR=%DRIVE%:\Java\jdk1.5.0_01
  SET JUNITDIR=%PD%\junit3.8.1
  SET MLDIR=%PD%\ml
-SET MSVCDir=C:\Program Files\Microsoft Visual Studio
-SET NEON=%PD%\neon-0.24.7
-SET OPENSSL=%PD%\openssl-0.9.7d
+SET MSVCDir="C:\Program Files\Microsoft Visual Studio"
+SET NEON=%PD%\neon
+SET OPENSSL=%PD%\openssl-0.9.7f
  SET PERL=C:\perl
  SET PERLBIN=%PERL%\bin
  SET PERLINCLUDE=%PERL%\lib\CORE
  SET PERLLIB=%PERL%\lib\CORE
-SET PYTHONDIR=C:\Python23
+SET PYTHONDIR=C:\Python24
  SET RUBY=C:\ruby-1.8.2
  SET RUBYINCLUDE=C:\ruby-1.8.2\lib\ruby\1.8\i386-mswin32
-SET SDKINC=D:\Microsoft SDK\include
-SET SDKLIB=D:\Microsoft SDK\lib
-SET SSL=%PD%\openssl-0.9.7d
+SET SDKINC="C:\Program Files\Microsoft SDK\include"
+SET SDKLIB="C:\Program Files\Microsoft SDK\lib"
+SET SSL=%PD%\openssl-0.9.7f
  SET SWIG=%PD%\swig-1.3.21
  SET ZLIB=%PD%\zlib-1.2.2

  rem ** for vc6-build.bat
-set AWKDIR=D:\UTILITY
+set AWKDIR=%DRIVE%:\UTILITY
  rem set NASMDIR=%PD%\ML
  rem the line above points to MASM

  rem ** from INSTALL E.4 Building the Binaries, open ssh
-set AWKDIR=D:\UTILITY
+set AWKDIR=%DRIVE%:\UTILITY
  set ASMDIR=%PD%\ML

+rem ** for mail-nightly-build.py

+rem * If you don't need smtp auth, leave ID and pwd blank
+set from_address=user@example.com
+set SMTP_server=smtp.example.com
+set SMTP_auth_ID=
+set SMTP_auth_pwd=

  REM **** Derivative settings

  SET CLASSPATH=%CLASSPATH%;%JUNITDIR%\junit.jar;%JUNITDIR%
  SET
INCLUDE=%SDKINC%;%BDB%\include;%INCLUDE%;%LIBINTLINC%;%MSVCDIR%\VC98\atl\include;%MSVCDIR%\VC98\mfc\include;%MSVCDIR%\VC98\include
  SET
LIB=%SDKLIB%;%BDB%\lib;%LIB%;%LIBINTLLIB%;%MSVCDIR%\VC98\mfc\lib;%MSVCDIR%\VC98\lib
-SET
PATH=%PATH%;%BDB%\bin;%MLDIR%;%PYTHONDIR%;%LIBINTLBIN%;%PERLBIN%;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem;C:\Program
Files\Common Files\Roxio Shared\DLLShared;D:\utility;C:\Program
Files\Subversion\bin;%MSVCDIR%\Common\Tools\WinNT;%MSVCDIR%\Common\MSDev98\Bin;%MSVCDIR%\Common\Tools;%MSVCDIR%\VC98\bin;%SWIG%
+SET
PATH=%PATH%;%BDB%\bin;%MLDIR%;%PYTHONDIR%;%LIBINTLBIN%;%PERLBIN%;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem;C:\Program
Files\Common Files\Roxio Shared\DLLShared;%DRIVE%:\utility;C:\Program
Files\Subversion\bin;%MSVCDIR%\Common\Tools\WinNT;%MSVCDIR%\Common\MSDev98\Bin;%MSVCDIR%\Common\Tools;%MSVCDIR%\VC98\bin;%SWIG%

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Jun 11 00:33:14 2005

This is an archived mail posted to the Subversion Dev mailing list.