Commits

Satish Balay committed dc1b40d Merge

Merge branch 'maint'

Comments (0)

Files changed (3)

config/BuildSystem/config/base.py

       if os.path.isfile(self.linkerObj):os.remove(self.linkerObj)
       pdbfile = os.path.splitext(self.linkerObj)[0]+'.pdb'
       if os.path.isfile(pdbfile): os.remove(pdbfile)
-    return (out+err, ret)
+    return (out+'\n'+err, ret)
 
   def checkLink(self, includes = '', body = '', cleanup = 1, codeBegin = None, codeEnd = None, shared = 0, linkLanguage=None, examineOutput=lambda ret,out,err:None):
     (output, returnCode) = self.outputLink(includes, body, cleanup, codeBegin, codeEnd, shared, linkLanguage, examineOutput)

config/configure.py

       sys.exit(3)
   return 0
 
+def chkusingwindowspython():
+  if sys.platform == 'win32':
+    print '==============================================================================='
+    print ' *** Windows python detected. Please rerun ./configure with cygwin-python. ***'
+    print '==============================================================================='
+    sys.exit(3)
+  return 0
+
 def chkcygwinpython():
   if os.path.exists('/usr/bin/cygcheck.exe') and sys.platform == 'cygwin' :
     sys.argv.append('--useThreads=0')
   chkbrokencygwin()
   # Disable threads on RHL9
   chkrhl9()
+  # Make sure cygwin-python is used on windows
+  chkusingwindowspython()
   # Threads don't work for cygwin & python...
   chkcygwinpython()
   chkcygwinlink()

src/docs/tex/manual/part2.tex

 \]
 Now applying the backward Euler method results in
 \[
-        ( B - dt^n A  ) u^{n+1} = A u^n,
+        ( B - dt^n A  ) u^{n+1} = B u^n,
 \]
 in which
 \[