From 4655c8cfdeb75538d910f4ff0c2528fb9683e6f7 Mon Sep 17 00:00:00 2001 From: Tom Keffer Date: Mon, 18 Jun 2012 18:11:54 +0000 Subject: [PATCH 1/7] Fixed bug in link on smartphone formatted webpage. Retained old "mobile formatted" page. --- bin/weewx/__init__.py | 2 +- docs/upgrading.htm | 16 +++++++++------- skins/Standard/index.html.tmpl | 3 ++- skins/Standard/mobile/index.html.tmpl | 2 +- skins/Standard/skin.conf | 3 +++ weewx.conf | 2 +- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/bin/weewx/__init__.py b/bin/weewx/__init__.py index eedd1fef..7ffbcf22 100644 --- a/bin/weewx/__init__.py +++ b/bin/weewx/__init__.py @@ -12,7 +12,7 @@ """ import time -__version__="1.14.0b1" +__version__="1.14.0b2" # Holds the program launch time in unix epoch seconds: # Useful for calculating 'uptime.' diff --git a/docs/upgrading.htm b/docs/upgrading.htm index 9247d86b..8f66902b 100644 --- a/docs/upgrading.htm +++ b/docs/upgrading.htm @@ -23,11 +23,11 @@

What follows are directions for upgrading from specific versions.

V1.13 or earlier

Version 1.14 introduces some new webpages that have been expressly formatted for -the smartphone, using jQuery.

+the smartphone by using jQuery.

The skins shipped with the distribution take advantage of these features. If -you do nothing, your old skins will continue to work, but you will not take +you do nothing, your old skins will continue to work, but you will not be taking advantage of these new webpages.

-

If you want these new webpages, then you have two choices:

+

If you want them, then you have two choices:

  1. Rename your old skin directory (call it "skins.old") then do the install. This will install the new skin distribution. You can @@ -40,11 +40,11 @@ advantage of these new webpages.

    skins/Standard/mobile from the distribution into your skins/Standard directory. You will then need to modify your skin.conf.
-

Replace the section that looks like

+

After the section that looks like

       [[[Mobile]]]
             template = mobile.html.tmpl
-

with a section that looks like

-
        [[[Mobile]]]
+
add the following directives:

+
        [[[MobileSmartphone]]]
             template = mobile/index.html.tmpl
             
         [[[MobileTempOutside]]]
@@ -73,7 +73,9 @@ to add the highlighted files:

     copy_once = backgrounds/*, weewx.css, mobile.css, favicon.ico, mobile/icons/*, mobile/custom.js

 
Whichever approach you chose, the generated files will appear in
 public_html/mobile. The start of the document root 
-will be at public_html/mobile/index.html.

+will be at public_html/mobile/index.html. You may want 
+to add a link to this in the template for your main index page
+skins/Standard/index.html.tmpl.

 
V1.12 or earlier

 
Version 1.13 changed the way binding happens to the databases used in reports 
 so that it happens much later. The upshot is that the signature of a few 
diff --git a/skins/Standard/index.html.tmpl b/skins/Standard/index.html.tmpl
index 7b690a20..b89d58c1 100644
--- a/skins/Standard/index.html.tmpl
+++ b/skins/Standard/index.html.tmpl
@@ -309,7 +309,8 @@
             fast, and easy to understand by leveraging modern software concepts.
           

           
RSS feed

-          
Mobile formatted

+          
Mobile formatted

+          
Smartphone formatted

           
Weewx uptime:  $station.uptime

              Server uptime: $station.os_uptime

              weewx v$station.version

diff --git a/skins/Standard/mobile/index.html.tmpl b/skins/Standard/mobile/index.html.tmpl
index 21a5b383..8a1bf214 100644
--- a/skins/Standard/mobile/index.html.tmpl
+++ b/skins/Standard/mobile/index.html.tmpl
@@ -29,7 +29,7 @@
 
       
 
     
diff --git a/skins/Standard/skin.conf b/skins/Standard/skin.conf
index c663f45d..87a04b99 100644
--- a/skins/Standard/skin.conf
+++ b/skins/Standard/skin.conf
@@ -244,6 +244,9 @@
             template = RSS/weewx_rss.xml.tmpl
                 
         [[[Mobile]]]
+            template = mobile.html.tmpl
+            
+        [[[MobileSmartphone]]]
             template = mobile/index.html.tmpl
             
         [[[MobileTempOutside]]]
diff --git a/weewx.conf b/weewx.conf
index ca180631..6e369fc7 100644
--- a/weewx.conf
+++ b/weewx.conf
@@ -29,7 +29,7 @@ debug = 0
 socket_timeout = 20
 
 # Current version
-version = 1.14.0b1
+version = 1.14.0b2
 
 ############################################################################################
 

From 7cdadf521bdfa9209fa7a1a2a31d2a577d4da234 Mon Sep 17 00:00:00 2001
From: Tom Keffer 
Date: Mon, 18 Jun 2012 18:40:39 +0000
Subject: [PATCH 2/7] Moved daemon.py back to bin

---
 bin/{weeutil => }/daemon.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename bin/{weeutil => }/daemon.py (100%)

diff --git a/bin/weeutil/daemon.py b/bin/daemon.py
similarity index 100%
rename from bin/weeutil/daemon.py
rename to bin/daemon.py

From 0b811d1b13893ac203617064b71d2d63f4c90014 Mon Sep 17 00:00:00 2001
From: Tom Keffer 
Date: Mon, 18 Jun 2012 18:55:33 +0000
Subject: [PATCH 3/7] Changed import for module daemon

---
 bin/weewx/wxengine.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/weewx/wxengine.py b/bin/weewx/wxengine.py
index 207198f3..78211618 100644
--- a/bin/weewx/wxengine.py
+++ b/bin/weewx/wxengine.py
@@ -23,7 +23,7 @@ import gc
 
 # 3rd party imports:
 import configobj
-import weeutil.daemon
+import daemon
 
 # weewx imports:
 import weewx.archive
@@ -608,7 +608,7 @@ def parseArgs():
         sys.exit(weewx.CMD_ERROR)
     
     if options.daemon:
-        weeutil.daemon.daemonize(pidfile=options.pidfile)
+        daemon.daemonize(pidfile=options.pidfile)
 
     return (options, args)
 

From 47dbd1766ed80deca483c75f6759adcc5f1ee9ff Mon Sep 17 00:00:00 2001
From: Tom Keffer 
Date: Mon, 18 Jun 2012 22:56:43 +0000
Subject: [PATCH 4/7] Changed import for module daemon

---
 MANIFEST              | 1 -
 bin/weewx/wxengine.py | 2 +-
 docs/customizing.htm  | 9 +++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/MANIFEST b/MANIFEST
index 0b30b073..151c541a 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -5,7 +5,6 @@ setup.cfg
 setup.py
 weewx.conf
 bin/configure.py
-bin/daemon.py
 bin/runreports.py
 bin/weewxd.py
 bin/examples/__init__.py
diff --git a/bin/weewx/wxengine.py b/bin/weewx/wxengine.py
index 78211618..78a9177f 100644
--- a/bin/weewx/wxengine.py
+++ b/bin/weewx/wxengine.py
@@ -33,7 +33,7 @@ import weewx.reportengine
 import weeutil.weeutil
 
 usagestr = """
-  %prog config_path [--help] [--daemon] [--pidfile pidfile] [--version] [--exit]
+  %prog config_path [--help] [--daemon] [--pidfile=PIDFILE] [--version] [--exit]
 
   Entry point to the weewx weather program. Can be run from the command
   line or, by specifying the '--daemon' option, as a daemon.
diff --git a/docs/customizing.htm b/docs/customizing.htm
index e7bea5e3..50db1d80 100644
--- a/docs/customizing.htm
+++ b/docs/customizing.htm
@@ -1625,10 +1625,11 @@ outTemp = Outside Temperature
label = Rain (daily avg)

This will generate an image file with name monthrain.png. - It will be a bar plot. Option yscale controls the - y-axis scaling — if left out, the scale will automatically be chosen. However, - in this example we are choosing to exercise some degree of control by specifying - values explicitly. It is a 3-way tuple (ylow, yhigh, min_interval), where ymin and ymax are the minimum + It will be a bar plot. Option yscale + controls the y-axis scaling — if left out, the scale will + automatically be chosen. However, in this example we are + choosing to exercise some degree of control by specifying values + explicitly. The option takes a 3-way tuple (ylow, yhigh, min_interval), where ylow and yhigh are the minimum and maximum y-axis values, respectively, and min_interval is the minimum tick interval. If set to 'None', the corresponding value will be automatically chosen. So, in this example, we are From 64373a147b41837143839535fa7a846f6fcee15d Mon Sep 17 00:00:00 2001 From: Tom Keffer Date: Mon, 18 Jun 2012 23:05:29 +0000 Subject: [PATCH 5/7] Renamed subdirector 'mobile' to 'smartphone' --- bin/weewx/__init__.py | 2 +- docs/upgrading.htm | 18 +++++++++--------- setup.py | 12 ++++++------ skins/Standard/index.html.tmpl | 2 +- skins/Standard/skin.conf | 14 +++++++------- .../barometer.html.tmpl | 0 .../Standard/{mobile => smartphone}/custom.js | 0 .../{mobile => smartphone}/humidity.html.tmpl | 0 .../icons/icon_ipad_x1.png | Bin .../icons/icon_ipad_x2.png | Bin .../icons/icon_iphone_x1.png | Bin .../icons/icon_iphone_x2.png | Bin .../{mobile => smartphone}/index.html.tmpl | 0 .../{mobile => smartphone}/radar.html.tmpl | 0 .../{mobile => smartphone}/rain.html.tmpl | 0 .../temp_outside.html.tmpl | 0 .../{mobile => smartphone}/wind.html.tmpl | 0 weewx.conf | 2 +- 18 files changed, 25 insertions(+), 25 deletions(-) rename skins/Standard/{mobile => smartphone}/barometer.html.tmpl (100%) rename skins/Standard/{mobile => smartphone}/custom.js (100%) rename skins/Standard/{mobile => smartphone}/humidity.html.tmpl (100%) rename skins/Standard/{mobile => smartphone}/icons/icon_ipad_x1.png (100%) rename skins/Standard/{mobile => smartphone}/icons/icon_ipad_x2.png (100%) rename skins/Standard/{mobile => smartphone}/icons/icon_iphone_x1.png (100%) rename skins/Standard/{mobile => smartphone}/icons/icon_iphone_x2.png (100%) rename skins/Standard/{mobile => smartphone}/index.html.tmpl (100%) rename skins/Standard/{mobile => smartphone}/radar.html.tmpl (100%) rename skins/Standard/{mobile => smartphone}/rain.html.tmpl (100%) rename skins/Standard/{mobile => smartphone}/temp_outside.html.tmpl (100%) rename skins/Standard/{mobile => smartphone}/wind.html.tmpl (100%) diff --git a/bin/weewx/__init__.py b/bin/weewx/__init__.py index 7ffbcf22..cc82d0e4 100644 --- a/bin/weewx/__init__.py +++ b/bin/weewx/__init__.py @@ -12,7 +12,7 @@ """ import time -__version__="1.14.0b2" +__version__="1.14.0b3" # Holds the program launch time in unix epoch seconds: # Useful for calculating 'uptime.' diff --git a/docs/upgrading.htm b/docs/upgrading.htm index 8f66902b..80da320a 100644 --- a/docs/upgrading.htm +++ b/docs/upgrading.htm @@ -37,7 +37,7 @@ advantage of these new webpages.

  • Alternatively, change the contents of your existing skin directory to include the new webpages. If you take this approach, you will need to copy over the contents of the subdirectory - skins/Standard/mobile from the distribution into your skins/Standard + skins/Standard/smartphone from the distribution into your skins/Standard directory. You will then need to modify your skin.conf.

    After the section that looks like

    @@ -45,22 +45,22 @@ advantage of these new webpages.

    template = mobile.html.tmpl

    add the following directives:

            [[[MobileSmartphone]]]
-            template = mobile/index.html.tmpl
+            template = smartphone/index.html.tmpl
             
         [[[MobileTempOutside]]]
-            template = mobile/temp_outside.html.tmpl
+            template = smartphone/temp_outside.html.tmpl
 
         [[[MobileRain]]]
-            template = mobile/rain.html.tmpl
+            template = smartphone/rain.html.tmpl
 
         [[[MobileBarometer]]]
-            template = mobile/barometer.html.tmpl
+            template = smartphone/barometer.html.tmpl
 
         [[[MobileWind]]]
-            template = mobile/wind.html.tmpl
+            template = smartphone/wind.html.tmpl
             
         [[[MobileRadar]]]
-            template = mobile/radar.html.tmpl
    + template = smartphone/radar.html.tmpl

    Then modify section [CopyGenerator] to add the highlighted files:

    [CopyGenerator]
@@ -70,10 +70,10 @@ to add the highlighted files:
    
     #
 
     # List of files that are to be copied at the first invocation of the generator only
-    copy_once = backgrounds/*, weewx.css, mobile.css, favicon.ico, mobile/icons/*, mobile/custom.js
    + copy_once = backgrounds/*, weewx.css, mobile.css, favicon.ico, smartphone/icons/*, smartphone/custom.js

    Whichever approach you chose, the generated files will appear in public_html/mobile. The start of the document root -will be at public_html/mobile/index.html. You may want +will be at public_html/smartphone/index.html. You may want to add a link to this in the template for your main index page skins/Standard/index.html.tmpl.

    V1.12 or earlier

    diff --git a/setup.py b/setup.py index 851ddc3a..d390d681 100755 --- a/setup.py +++ b/setup.py @@ -364,12 +364,12 @@ setup(name='weewx', ('skins/Standard/backgrounds', ['skins/Standard/backgrounds/band.gif']), ('skins/Standard/NOAA', ['skins/Standard/NOAA/NOAA-YYYY.txt.tmpl', 'skins/Standard/NOAA/NOAA-YYYY-MM.txt.tmpl']), ('skins/Standard/RSS', ['skins/Standard/RSS/weewx_rss.xml.tmpl']), - ('skins/Standard/mobile', ['skins/Standard/mobile/barometer.html.tmpl', 'skins/Standard/mobile/custom.js', - 'skins/Standard/mobile/humidity.html.tmpl', 'skins/Standard/mobile/index.html.tmpl', - 'skins/Standard/mobile/radar.html.tmpl', 'skins/Standard/mobile/rain.html.tmpl', - 'skins/Standard/mobile/temp_outside.html.tmpl', 'skins/Standard/mobile/wind.html.tmpl']), - ('skins/Standard/mobile/icons',['skins/Standard/mobile/icons/icon_ipad_x1.png', 'skins/Standard/mobile/icons/icon_ipad_x2.png', - 'skins/Standard/mobile/icons/icon_iphone_x1.png','skins/Standard/mobile/icons/icon_iphone_x2.png']), + ('skins/Standard/smartphone', ['skins/Standard/smartphone/barometer.html.tmpl', 'skins/Standard/smartphone/custom.js', + 'skins/Standard/smartphone/humidity.html.tmpl', 'skins/Standard/smartphone/index.html.tmpl', + 'skins/Standard/smartphone/radar.html.tmpl', 'skins/Standard/smartphone/rain.html.tmpl', + 'skins/Standard/smartphone/temp_outside.html.tmpl', 'skins/Standard/smartphone/wind.html.tmpl']), + ('skins/Standard/smartphone/icons',['skins/Standard/smartphone/icons/icon_ipad_x1.png', 'skins/Standard/smartphone/icons/icon_ipad_x2.png', + 'skins/Standard/smartphone/icons/icon_iphone_x1.png','skins/Standard/smartphone/icons/icon_iphone_x2.png']), ('skins/Standard', ['skins/Standard/favicon.ico', 'skins/Standard/mobile.css', 'skins/Standard/mobile.html.tmpl', 'skins/Standard/index.html.tmpl', 'skins/Standard/month.html.tmpl', diff --git a/skins/Standard/index.html.tmpl b/skins/Standard/index.html.tmpl index b89d58c1..957fd2b9 100644 --- a/skins/Standard/index.html.tmpl +++ b/skins/Standard/index.html.tmpl @@ -310,7 +310,7 @@

    RSS feed

    Mobile formatted

    -

    Smartphone formatted

    +

    Smartphone formatted

    Weewx uptime: $station.uptime
    Server uptime: $station.os_uptime
    weewx v$station.version

    diff --git a/skins/Standard/skin.conf b/skins/Standard/skin.conf index 87a04b99..31d1d85e 100644 --- a/skins/Standard/skin.conf +++ b/skins/Standard/skin.conf @@ -247,22 +247,22 @@ template = mobile.html.tmpl [[[MobileSmartphone]]] - template = mobile/index.html.tmpl + template = smartphone/index.html.tmpl [[[MobileTempOutside]]] - template = mobile/temp_outside.html.tmpl + template = smartphone/temp_outside.html.tmpl [[[MobileRain]]] - template = mobile/rain.html.tmpl + template = smartphone/rain.html.tmpl [[[MobileBarometer]]] - template = mobile/barometer.html.tmpl + template = smartphone/barometer.html.tmpl [[[MobileWind]]] - template = mobile/wind.html.tmpl + template = smartphone/wind.html.tmpl [[[MobileRadar]]] - template = mobile/radar.html.tmpl + template = smartphone/radar.html.tmpl ############################################################################################ @@ -273,7 +273,7 @@ # # List of files that are to be copied at the first invocation of the generator only - copy_once = backgrounds/*, weewx.css, mobile.css, favicon.ico, mobile/icons/*, mobile/custom.js + copy_once = backgrounds/*, weewx.css, mobile.css, favicon.ico, smartphone/icons/*, smartphone/custom.js # List of files to be copied every time: # copy_always = diff --git a/skins/Standard/mobile/barometer.html.tmpl b/skins/Standard/smartphone/barometer.html.tmpl similarity index 100% rename from skins/Standard/mobile/barometer.html.tmpl rename to skins/Standard/smartphone/barometer.html.tmpl diff --git a/skins/Standard/mobile/custom.js b/skins/Standard/smartphone/custom.js similarity index 100% rename from skins/Standard/mobile/custom.js rename to skins/Standard/smartphone/custom.js diff --git a/skins/Standard/mobile/humidity.html.tmpl b/skins/Standard/smartphone/humidity.html.tmpl similarity index 100% rename from skins/Standard/mobile/humidity.html.tmpl rename to skins/Standard/smartphone/humidity.html.tmpl diff --git a/skins/Standard/mobile/icons/icon_ipad_x1.png b/skins/Standard/smartphone/icons/icon_ipad_x1.png similarity index 100% rename from skins/Standard/mobile/icons/icon_ipad_x1.png rename to skins/Standard/smartphone/icons/icon_ipad_x1.png diff --git a/skins/Standard/mobile/icons/icon_ipad_x2.png b/skins/Standard/smartphone/icons/icon_ipad_x2.png similarity index 100% rename from skins/Standard/mobile/icons/icon_ipad_x2.png rename to skins/Standard/smartphone/icons/icon_ipad_x2.png diff --git a/skins/Standard/mobile/icons/icon_iphone_x1.png b/skins/Standard/smartphone/icons/icon_iphone_x1.png similarity index 100% rename from skins/Standard/mobile/icons/icon_iphone_x1.png rename to skins/Standard/smartphone/icons/icon_iphone_x1.png diff --git a/skins/Standard/mobile/icons/icon_iphone_x2.png b/skins/Standard/smartphone/icons/icon_iphone_x2.png similarity index 100% rename from skins/Standard/mobile/icons/icon_iphone_x2.png rename to skins/Standard/smartphone/icons/icon_iphone_x2.png diff --git a/skins/Standard/mobile/index.html.tmpl b/skins/Standard/smartphone/index.html.tmpl similarity index 100% rename from skins/Standard/mobile/index.html.tmpl rename to skins/Standard/smartphone/index.html.tmpl diff --git a/skins/Standard/mobile/radar.html.tmpl b/skins/Standard/smartphone/radar.html.tmpl similarity index 100% rename from skins/Standard/mobile/radar.html.tmpl rename to skins/Standard/smartphone/radar.html.tmpl diff --git a/skins/Standard/mobile/rain.html.tmpl b/skins/Standard/smartphone/rain.html.tmpl similarity index 100% rename from skins/Standard/mobile/rain.html.tmpl rename to skins/Standard/smartphone/rain.html.tmpl diff --git a/skins/Standard/mobile/temp_outside.html.tmpl b/skins/Standard/smartphone/temp_outside.html.tmpl similarity index 100% rename from skins/Standard/mobile/temp_outside.html.tmpl rename to skins/Standard/smartphone/temp_outside.html.tmpl diff --git a/skins/Standard/mobile/wind.html.tmpl b/skins/Standard/smartphone/wind.html.tmpl similarity index 100% rename from skins/Standard/mobile/wind.html.tmpl rename to skins/Standard/smartphone/wind.html.tmpl diff --git a/weewx.conf b/weewx.conf index 6e369fc7..5be17010 100644 --- a/weewx.conf +++ b/weewx.conf @@ -29,7 +29,7 @@ debug = 0 socket_timeout = 20 # Current version -version = 1.14.0b2 +version = 1.14.0b3 ############################################################################################ From ced3934f05d3e3225227d7d77c8ebc51ec6191e7 Mon Sep 17 00:00:00 2001 From: Tom Keffer Date: Mon, 18 Jun 2012 23:42:24 +0000 Subject: [PATCH 6/7] Updated Change log. Corrected package error in setup.py (for daemon.py). Version 1.14.0 --- MANIFEST | 25 +++++++++++++------------ bin/weewx/__init__.py | 2 +- docs/CHANGES.txt | 12 +++++++----- setup.py | 1 + weewx.conf | 2 +- 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/MANIFEST b/MANIFEST index 151c541a..8369320a 100644 --- a/MANIFEST +++ b/MANIFEST @@ -5,6 +5,7 @@ setup.cfg setup.py weewx.conf bin/configure.py +bin/daemon.py bin/runreports.py bin/weewxd.py bin/examples/__init__.py @@ -70,18 +71,18 @@ skins/Standard/backgrounds/drops.gif skins/Standard/backgrounds/flower.jpg skins/Standard/backgrounds/leaf.jpg skins/Standard/backgrounds/night.gif -skins/Standard/mobile/barometer.html.tmpl -skins/Standard/mobile/custom.js -skins/Standard/mobile/humidity.html.tmpl -skins/Standard/mobile/index.html.tmpl -skins/Standard/mobile/radar.html.tmpl -skins/Standard/mobile/rain.html.tmpl -skins/Standard/mobile/temp_outside.html.tmpl -skins/Standard/mobile/wind.html.tmpl -skins/Standard/mobile/icons/icon_ipad_x1.png -skins/Standard/mobile/icons/icon_ipad_x2.png -skins/Standard/mobile/icons/icon_iphone_x1.png -skins/Standard/mobile/icons/icon_iphone_x2.png +skins/Standard/smartphone/barometer.html.tmpl +skins/Standard/smartphone/custom.js +skins/Standard/smartphone/humidity.html.tmpl +skins/Standard/smartphone/index.html.tmpl +skins/Standard/smartphone/radar.html.tmpl +skins/Standard/smartphone/rain.html.tmpl +skins/Standard/smartphone/temp_outside.html.tmpl +skins/Standard/smartphone/wind.html.tmpl +skins/Standard/smartphone/icons/icon_ipad_x1.png +skins/Standard/smartphone/icons/icon_ipad_x2.png +skins/Standard/smartphone/icons/icon_iphone_x1.png +skins/Standard/smartphone/icons/icon_iphone_x2.png start_scripts/BSD/weewx start_scripts/Debian/weewx start_scripts/SuSE/weewx diff --git a/bin/weewx/__init__.py b/bin/weewx/__init__.py index cc82d0e4..601e04f4 100644 --- a/bin/weewx/__init__.py +++ b/bin/weewx/__init__.py @@ -12,7 +12,7 @@ """ import time -__version__="1.14.0b3" +__version__="1.14.0" # Holds the program launch time in unix epoch seconds: # Useful for calculating 'uptime.' diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 85ae0c91..6c68b514 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -4,15 +4,17 @@ CHANGE HISTORY For complete documentation, see http://www.weewx.com/docs -1.14.0 06/15/12 +1.14.0 06/18/12 Added smartphone formatted mobile webpage, contributed by user Torbjörn Einarsson. -It is generated by default. If you have custom templates, see the upgrade guide -on how to have these webpages generated. Thanks, Tobbe! +If you are doing a fresh install, then these pages will be generated automatically. +If you are doing an upgrade, then see the upgrade guide on how to have these webpages +generated. Thanks, Tobbe! Three changes suggested by user Charlie Spirakis: - o Changed umask in daemon.py to 0022. - o Allow location of process ID file to be specified on the command line. + o Changed umask in daemon.py to 0022; + o Allow location of process ID file to be specified on the command line + of weewx; o Start script allows daemon to be run as a specific user. Thanks, Charlie! diff --git a/setup.py b/setup.py index d390d681..72d1bdfa 100755 --- a/setup.py +++ b/setup.py @@ -352,6 +352,7 @@ setup(name='weewx', url='http://www.weewx.com', package_dir = {'' : 'bin'}, packages = ['weewx', 'weeplot', 'weeutil', 'examples', 'user'], + py_modules = ['daemon'], scripts = ['bin/configure.py', 'bin/weewxd.py', 'bin/runreports.py'], data_files = [('', ['LICENSE.txt', 'README', 'weewx.conf']), ('docs', ['docs/CHANGES.txt', 'docs/customizing.htm', diff --git a/weewx.conf b/weewx.conf index 5be17010..e8699b0b 100644 --- a/weewx.conf +++ b/weewx.conf @@ -29,7 +29,7 @@ debug = 0 socket_timeout = 20 # Current version -version = 1.14.0b3 +version = 1.14.0 ############################################################################################ From c34cb3fca17ba48a1c2391b8acb613142aeb25c0 Mon Sep 17 00:00:00 2001 From: Tom Keffer Date: Mon, 18 Jun 2012 23:52:11 +0000 Subject: [PATCH 7/7] Corrected typo in upgrading guide. --- docs/upgrading.htm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/upgrading.htm b/docs/upgrading.htm index 80da320a..5f8815ca 100644 --- a/docs/upgrading.htm +++ b/docs/upgrading.htm @@ -72,7 +72,7 @@ to add the highlighted files:

    # List of files that are to be copied at the first invocation of the generator only copy_once = backgrounds/*, weewx.css, mobile.css, favicon.ico, smartphone/icons/*, smartphone/custom.js

    Whichever approach you chose, the generated files will appear in -public_html/mobile. The start of the document root +public_html/smartphone. The start of the document root will be at public_html/smartphone/index.html. You may want to add a link to this in the template for your main index page skins/Standard/index.html.tmpl.