-
-
- Quick-Start -
- - If you use a Debian-based system, such as Ubuntu, Mint, or - Raspian, then you may want to follow this "quick start" guide. - It will help you do a basic install to get you started, which - you can then refine. Alternatively, you can follow the more - complete directions in the User's Guide. - +
- Quick-Start +
-
+ Follow the installation instructions for a basic install, which
+ you can then refine. For detailed instructions, see the
+ User's Guide.
+
+ Instructions for Debian, Ubuntu, Mint, Raspbian
+
+ Instructions for Redhat, Centos, Fedora
+ Instructions for SUSE, OpenSUSE
+ Instructions for MacOS
+ - User's Guide
-
@@ -93,8 +97,8 @@ Version: 3.7
- List of the changes in each release.
- Hardware Comparison -
- Are you looking for a weather station? Are you considering
- building your own station? This table lists the sensors,
+
- Are you looking for a weather station? Would you like to + build your own station? This table lists the sensors, configurations, and specifications for various types of weather-related hardware.
diff --git a/docs/redhat.htm b/docs/redhat.htm index 930426a9..2bde6ae5 100644 --- a/docs/redhat.htm +++ b/docs/redhat.htm @@ -96,7 +96,7 @@ sudo rm -r /var/www/html/weewxLayout
The installation will result in the following layout:
-+
executable: /usr/bin/weewxd diff --git a/docs/setup.htm b/docs/setup.htm index 134b8f65..d38dd0f0 100644 --- a/docs/setup.htm +++ b/docs/setup.htm @@ -238,7 +238,7 @@ sudo rm /etc/init.d/weewxThe installation will place weeWX in the /home/weewx directory with the following layout:
-+
executable: /home/weewx/bin/weewxd diff --git a/docs/suse.htm b/docs/suse.htm index 9a39d4e5..b24f03ce 100644 --- a/docs/suse.htm +++ b/docs/suse.htm @@ -93,7 +93,7 @@ sudo rm -r /var/www/html/weewxLayout
The installation will result in the following layout:
-+
executable: /usr/bin/weewxd diff --git a/docs/utilities.htm b/docs/utilities.htm index df3eba3e..74f16edd 100644 --- a/docs/utilities.htm +++ b/docs/utilities.htm @@ -340,13 +340,13 @@ Usage: wee_database --help wee_database --check-strings wee_database --fix-strings [--dry-run] wee_database --drop-daily - wee_database --rebuild-daily - [--date=YYYY-mm-dd | --from=YYYY-mm-dd --to=YYYY-mm-dd] + wee_database --rebuild-daily [--date=YYYY-mm-dd | + --from=YYYY-mm-dd --to=YYYY-mm-dd] Description: -Manipulate the weeWX database. Most of these operations are handled automatically -by weeWX, but they may be useful in special cases. +Manipulate the weeWX database. Most of these operations are handled +automatically by weeWX, but they may be useful in special cases. Options: -h, --help show this help message and exit diff --git a/makefile b/makefile index cc7db3bd..1de7391f 100644 --- a/makefile +++ b/makefile @@ -6,7 +6,7 @@ SIGN=1 # destination for uploading releases -RELDIR=weewx.com:/downloads/development_versions/ +UPLOADDIR=weewx.com:/downloads/development_versions/ # destination for uploading docs DOCDST=weewx.com:/ @@ -63,7 +63,7 @@ info: @echo " VERSION: $(VERSION)" @echo " MMVERSION: $(MMVERSION)" @echo " CWD: $(CWD)" - @echo " RELDIR: $(RELDIR)" + @echo " UPLOADDIR: $(UPLOADDIR)" @echo " DOCDST: $(DOCDST)" @echo " USER: $(USER)" @@ -113,7 +113,7 @@ src-package $(DSTDIR)/$(SRCPKG): MANIFEST.in ./setup.py sdist upload-src: - (cd $(DSTDIR); ftp -u $(USER)@$(RELDIR) $(SRCPKG)) + (cd $(DSTDIR); ftp -u $(USER)@$(UPLOADDIR) $(SRCPKG)) # upload docs to the weewx web site upload-docs: @@ -148,7 +148,7 @@ readme: docs/changes.txt pkg/mkchangelog.pl --ifile docs/changes.txt >> $(DSTDIR)/README.txt upload-readme: readme - (cd $(DSTDIR); ftp -u $(USER)@$(RELDIR) README.txt) + (cd $(DSTDIR); ftp -u $(USER)@$(UPLOADDIR) README.txt) # update the version in all relevant places VDOCS=readme.htm customizing.htm devnotes.htm hardware.htm usersguide.htm upgrading.htm utilities.htm @@ -208,7 +208,7 @@ check-deb: lintian -Ivi $(DSTDIR)/$(DEBPKG) upload-deb: - (cd $(DSTDIR); ftp -u $(USER)@$(RELDIR) $(DEBPKG)) + (cd $(DSTDIR); ftp -u $(USER)@$(UPLOADDIR) $(DEBPKG)) RPMREVISION=1 RPMVER=$(VERSION)-$(RPMREVISION) @@ -262,16 +262,18 @@ check-rpm: rpmlint $(DSTDIR)/$(RPMPKG) upload-rpm: - (cd $(DSTDIR); ftp -u $(USER)@$(RELDIR) $(RPMPKG)) + (cd $(DSTDIR); ftp -u $(USER)@$(UPLOADDIR) $(RPMPKG)) -# move files from development_versions to previous_versions and set up the +# move files from the upload directory to the release directory and set up the # symlinks to them from the download root directory +DEVDIR=$(WEEWX_DOWNLOADS)/development_versions +RELDIR=$(WEEWX_DOWNLOADS)/released_versions ARTIFACTS=weewx-$(RPMVER).rhel.noarch.rpm weewx-$(RPMVER).suse.noarch.rpm weewx-$(VERSION).tar.gz weewx_$(DEBVER)_all.deb release: - ssh $(USER)@weewx.com "for f in $(ARTIFACTS); do mv $(WEEWX_DOWNLOADS)/development_versions/$$f $(WEEWX_DOWNLOADS)/previous_versions; done" - ssh $(USER)@weewx.com "rm $(WEEWX_DOWNLOADS)/weewx*" - ssh $(USER)@weewx.com "for f in $(ARTIFACTS); do ln -s $$f $(WEEWX_DOWNLOADS); done" - ssh $(USER)@weewx.com "mv $(WEEWX_DOWNLOADS)/README.txt $(WEEWX_DOWNLOADS)" + ssh $(USER)@weewx.com "for f in $(ARTIFACTS); do if [ -f $(DEVDIR)/$$f ]; then mv $(DEVDIR)/$$f $(RELDIR); fi; done" + ssh $(USER)@weewx.com "rm -f $(WEEWX_DOWNLOADS)/weewx*" + ssh $(USER)@weewx.com "for f in $(ARTIFACTS); do if [ -f $(RELDIR)/$$f ]; then ln -s released_versions/$$f $(WEEWX_DOWNLOADS); fi; done" + ssh $(USER)@weewx.com "if [ -f $(DEVDIR)/README.txt ]; then mv $(DEVDIR)/README.txt $(WEEWX_DOWNLOADS); fi" # run perlcritic to ensure clean perl code. put these in ~/.perlcriticrc: # [-CodeLayout::RequireTidyCode] diff --git a/pkg/changelog.rpm b/pkg/changelog.rpm index 8464177a..8cd20836 100644 --- a/pkg/changelog.rpm +++ b/pkg/changelog.rpm @@ -1,3 +1,5 @@ +* Fri Mar 10 2017 Matthew Wall (weewx))) { $clockmin = $1 if $1 < $clockmin; $clockmax = $1 if $1 > $clockmax; $clockcount += 1; - } elsif (/manager: added record/ || /archive: added record/) { + } elsif (/manager: Added record/ || /archive: added record/) { $counts{$ARCHIVE_RECORDS_ADDED} += 1; - } elsif (/genimages: Generated (\d+) images/) { + } elsif (/imagegenerator: Generated (\d+) images/) { $counts{$IMAGES_GENERATED} += $1; - } elsif (/genimages: aggregate interval required for aggregate type/ || - /genimages: line type \S+ skipped/) { + } elsif (/imagegenerator: aggregate interval required for aggregate type/ || + /imagegenerator: line type \S+ skipped/) { $errors{$_} = $errors{$_} ? $errors{$_} + 1 : 1; } elsif (/cheetahgenerator: Generated (\d+)/ || /cheetahgenerator: generated (\d+)/ || /filegenerator: generated (\d+)/) { $counts{$FILES_GENERATED} += $1; - } elsif (/reportengine: copied (\d+) files/) { + } elsif (/copygenerator: copied (\d+) files/) { $counts{$FILES_COPIED} += $1; } elsif (/restful: Skipped record/) { $counts{$RECORDS_SKIPPED} += 1; @@ -250,9 +250,9 @@ while(defined($_ = )) { /archive: Created and initialized/ || /reportengine: Running reports for latest time/ || /reportengine: Found configuration file/ || - /reportengine: FTP upload not requested/ || + /ftpgenerator: FTP upload not requested/ || /reportengine: Running report / || # only when debug=1 - /reportengine: rsync upload not requested/ || + /rsyncgenerator: rsync upload not requested/ || /restful: station will register with/ || /restful: Registration interval/ || /\*\*\*\* Registration interval/ || diff --git a/weewx.conf b/weewx.conf index 300f50e2..b81178a2 100644 --- a/weewx.conf +++ b/weewx.conf @@ -17,7 +17,7 @@ WEEWX_ROOT = /home/weewx socket_timeout = 20 # Do not modify this. It is used when installing and updating weewx. -version = 3.7.0b3 +version = 3.7.0 ##############################################################################
-
+