Minor fixes

svn path=/trunk/boinc/; revision=392

INSTALL

@@ -21,7 +21,8 @@ Makefile.in files.
 -------------------------------------------------------------------------------
 Downloading the Source
 
-BOINC is distributed via CVS and tarballs compressed with gzip. 
+BOINC is distributed via CVS, tarballs compressed with gzip, and Windows
+zip files.
 
 The BOINC distribution includes the scheduling servers, both in CGI and FastCGI
 versions, the application library, the client, the test scripts, sample
@@ -31,7 +32,13 @@ Unpack the distribution in one directory using the commands
     % gunzip boinc.tar.gz
     % tar xf boinc.tar
 
-If installing from CVS, download the entire CVS tree. 
+If installing from CVS, download the entire CVS tree.
+
+If installing on Windows, unzip boinc.zip or boinc.tar.gz.  Next, unzip
+win_build.zip inside the BOINC directory.
+
+If installing on Mac OS X, unzip boinc.zip or boinc.tar.gz.  Next, unstuff
+mac_build.sit inside the BOINC directory.
 
 -------------------------------------------------------------------------------
 Ensuring proper programs are installed
@@ -43,7 +50,7 @@ memory segment size of at least 32 megabytes (more is reccomended).
 It is highly reccomended that PHP be installed, as the test scripts and web
 administration are written in PHP and will not be usable without PHP installed.
 
-Apache should be configured to allow POST 
+Apache should be configured to allow POST.
 
 -------------------------------------------------------------------------------
 Setting environment variables

INSTALL_CLIENT

@@ -10,14 +10,15 @@ The installation procedure itself is broken into four steps
     4. Running the BOINC client
 
 Please note that BOINC currently only supports the targets all clean install
-uninstall and tar. Currently, BOINC is installed into the /usr/local/boinc/
+uninstall tar and zip. Currently, BOINC is installed into the /usr/local/boinc/
 directory structure. To install BOINC into a different directory structure,
 the macro INSTALL_DIR needs to be edited in the client/Makefile.in file.
 
 -------------------------------------------------------------------------------
 Downloading the Source
 
-BOINC is distributed via CVS and tarballs compressed with gzip. 
+BOINC is distributed via CVS, tarballs compressed with gzip, and Windows
+zip files.
 
 The BOINC client distribution includes the core client and the application 
 library. 
@@ -30,6 +31,12 @@ If installing from CVS, the boinc/client, boinc/api, boinc/lib, and
 boinc/RSAEuro directories must be downloaded. The boinc/doc directory may be
 downloaded if documentation is desired. 
 
+If installing on Windows, unzip boinc_client.zip or boinc_client.tar.gz.
+Next, unzip win_build.zip inside the BOINC directory.
+
+If installing on Mac OS X, unzip boinc_client.zip or boinc_client.tar.gz.
+Next, unstuff mac_build.sit inside the BOINC directory.
+
 -------------------------------------------------------------------------------
 Configuration
 
@@ -70,9 +77,9 @@ To make the BOINC client:
 Running the BOINC client
 
 The first time the BOINC client is run, it will prompt the user for some
-information, including the master url of the project the user wishes to join,
-the username, and an authenticator. The file will then attempt to contact the
-master url to get information about scheduling servers and attempt to begin
+information, including the master url of the project the user wishes to join
+and an authenticator. The file will then attempt to contact the master url
+to get information about scheduling servers and attempt to begin
 working on the project. After this first time running, the output from the 
 BOINC client may be redirected to /dev/null. The client can accept two
 command line options, -exit_when_idle, which will cause the client to exit

Makefile.in

@@ -122,9 +122,10 @@ uninstall:
 	cd tools; ${MAKE} uninstall;
 	$(RM) -r $(INSTALL_DIR)/tools;
 
-TAR_TARGETS = \
+ARCHIVE_TARGETS = \
         client/*.C client/*.cpp client/*.h client/configure \
         client/install-sh client/*.in client/*.sub client/*.guess \
+        client/mac/*.h client/mac/*.cpp \
         apps/*.C apps/*.h apps/*.in \
         db/*.sql db/*.h db/*.C db/*.in db/init_db \
         doc/*.* \
@@ -138,11 +139,14 @@ TAR_TARGETS = \
         tools/*.C tools/*.h tools/*.in \
         api/*.C api/*.h api/*.in \
         RSAEuro/*/*.c RSAEuro/*/*.h RSAEuro/*/*.in RSAEuro/*/*.mak \
-        INSTALL ACKNOWLEDGEMENTS LICENSE configure install-sh \
+        mac_build.sit win_build.zip INSTALL LICENSE configure install-sh \
         *.in *.sub *.guess *.m4
 
 tar: 
-	tar cf boinc.tar $(TAR_TARGETS) ; gzip boinc.tar
+	tar cf boinc.tar $(ARCHIVE_TARGETS) ; gzip boinc.tar
+
+zip:
+	zip boinc.zip $(ARCHIVE_TARGETS)
 
 client_tar: clean
 	cd client; ./configure; ${MAKE} tar;

client/Makefile.in

@@ -71,13 +71,14 @@ TEST_FX_OBJS = \
     file_names.o \
     file_xfer.o
 
-TAR_TARGETS = \
+ARCHIVE_TARGETS = \
         client/*.C client/*.cpp client/*.h client/configure \
         client/install-sh client/*.in client/*.sub client/*.guess \
+        client/mac/*.h client/mac/*.cpp \
         lib/*.C lib/*.c lib/*.h \
         api/*.C api/*.h \
         RSAEuro/*/*.c RSAEuro/*/*.h RSAEuro/*/*.in RSAEuro/*/*.mak \
-        INSTALL_CLIENT ACKNOWLEDGEMENTS LICENSE
+        mac_build.sit win_build.zip INSTALL_CLIENT LICENSE
 
 .C.o:
 	$(CC) -c -o $*.o $<
@@ -100,9 +101,12 @@ test_file_xfer: test_file_xfer.o $(TEST_FX_OBJS)
 	$(CC) test_file_xfer.o $(TEST_FX_OBJS) $(CLIBS) -o test_file_xfer
 
 tar:
-	cd $(topsrcdir)/..; tar cf boinc_client.tar $(TAR_TARGETS); \
+	cd $(topsrcdir)/..; tar cf boinc_client.tar $(ARCHIVE_TARGETS); \
 	    gzip boinc_client.tar;
 
+zip:
+	cd $(topsrcdir)/..; zip boinc_client.zip $(ARCHIVE_TARGETS)
+
 clean:
 	rm -f *.o $(PROGS) core dependencies Makefile config.cache
 	cd ../RSAEuro/source; ${MAKE} clean;

doc/account.html

@@ -12,10 +12,12 @@ <h2>Joining a project</h2>
 <li> A public "screen name" (real name or nickname).
 <li> A web password (chosen by the user).
 This is used to access the account via the project's web site.
+<li> Country (optional)
+<li> Postal Code (optional)
 </ul>
 
-<li> Receive an email containing an <b>account ID</b>
-(a long random string).
+<li> Receive an email containing an <b>account ID</b>,
+aka <b>authenticator</b> (a long random string).
 
 <li> Download and install the BOINC client program.
 It will ask for an account ID;

doc/app.html

@@ -37,7 +37,7 @@ <h2>Platforms, Applications, and Versions</h2>
 It is sent work only if this version is the minimum or greater. 
 
 <p>
-Application version are maintained in the <b>app_version</b> table
+Application versions are maintained in the <b>app_version</b> table
 in the BOINC DB, Each entry includes an XML document describing the
 files that make up the application version: 
 <pre>

doc/files.html

@@ -17,9 +17,13 @@ <h3>Files</h3>
     &lt;md5_cksum&gt;123123123123&lt;/md5_cksum&gt;
     &lt;nbytes&gt;134423&lt;/nbytes&gt;
     &lt;max_nbytes&gt;200000&lt;/max_nbytes&gt;
+    &lt;status&gt;1&lt;/status&gt;
+    [ &lt;generated_locally/&gt; ]
     [ &lt;executable/&gt; ]
     [ &lt;upload_when_present/&gt; ]
     [ &lt;sticky/&gt; ]
+    [ &lt;signature_required/&gt; ]
+    [ <a href=pers_file_xfer.html>&lt;persistent_file_xfer&gt; ...  &lt;/persistent_file_xfer&gt;</a> ]
 &lt;/file_info&gt;
 </pre>
 The components are as follows: 
@@ -34,12 +38,21 @@ <h3>Files</h3>
 <li> The <b>&lt;max_nbytes&gt;</b> element is the maximum allowable
 size of the file in bytes (may be greater than 2^32).
 This is used to prevent flooding data servers with bogus data.
-<li> The <b>&lt;sticky&gt;</b> element, if present, indicates that
-the file should be retained on the client after its initial use.
-<li> The <b>&lt;upload_when_present&gt;</b> element, if present,
-indicates that the file should be uploaded after it is created.
+<li> The <b>&lt;status&gt;</b> element is 0 if the file is not present,
+1 if the file is present, or a negative error code if there was a
+problem in downloading or generating the file.
+<li> The <b>&lt;generated_locally&gt;</b> element, if present,
+indicates that the file will be generated by an application on
+the client, as opposed to being downloaded.
 <li> The <b>&lt;executable&gt;</b> element, if present, indicates
 that the file protections should be set to allow execution.
+<li> The <b>&lt;upload_when_present&gt;</b> element, if present,
+indicates that the file should be uploaded after it is created.
+<li> The <b>&lt;sticky&gt;</b> element, if present, indicates that
+the file should be retained on the client after its initial use.
+<li> The <b>&lt;signature_required&gt;</b> element, if present,
+indicates that the file should be verified with an RSA signature.
+This generally only applies to executable files.
 </ul>
 These attributes allow the specification of various types of files: for
 example, input or output files that are retained for use as input to

doc/index.html

@@ -43,6 +43,13 @@
 How you can help debug and enhance the BOINC software.
 </font>
 
+<br><br>
+<a href=http://www.sf.net/projects/boinc/><b>BOINC on SourceForge</b></a>
+<br>
+<font size=-1>
+The SourceForge BOINC Project Homepage
+</font>
+
 <br><br>
 <a href=contact.html><b>Contact us</b></a>
 

doc/prefs.html

@@ -11,7 +11,7 @@ <h2>Preferences</h2>
 <li> Whether work (computation and network transfer) should be done
 while the host is being used (i.e. during keyboard and mouse input).
 <li> Whether work should be done while the computer is being powered
-by batteries.
+by batteries (for laptop users).
 <li> Whether to wait for user confirmation before making network connections.
 <li> Minimum and maximum amounts of work to maintain on disk.
 These values are expressed as time values X and Y.
@@ -45,7 +45,7 @@ <h2>Preferences</h2>
 <p>
 Each participant has a single set of preferences.
 If you want to have different preferences for different hosts,
-you must create a separate accounts. 
+you must create a separate account. 
 
 <h3>Propagation of preferences</h3> 
 <p>

html/user/index.php

@@ -52,6 +52,8 @@
 <li><a href=home.php>User home page</a></li> - view stats, modify preferences
 <li><a href=team.php>Teams</a></li> - join sample distributed computing project community
 </ul>
+<!--
 <scheduler>http://maggie.ssl.berkeley.edu/barry-cgi/cgi</scheduler>
+-->
 </td></tr></table>
 </body>

html/user/team_create_form.php

@@ -5,6 +5,11 @@
 require_once("team.inc");
 db_init();
 
-print_team_create_form();
+$user = get_user_from_cookie();
 
-?>
+if ($user == NULL) {
+    print_login_form();
+} else {
+    print_team_create_form();
+}
+?>