Menu
▾
▴
[Edu2-commits] SF.net SVN: edu2: [453]
|
From: <bl...@us...> - 2008-03-03 18:12:06
|
Revision: 453
http://edu2.svn.sourceforge.net/edu2/?rev=453&view=rev
Author: blackhc
Date: 2008-03-03 10:11:28 -0800 (Mon, 03 Mar 2008)
Log Message:
-----------
Some fixes I used for the release but didnt come around to commit.
Modified Paths:
--------------
edu2/edu2-launcher.bat
install/compressdir.bat
install/gpl-2.0.txt
install/readme.txt
install/script.iss
Modified: edu2/edu2-launcher.bat
===================================================================
--- edu2/edu2-launcher.bat 2008-03-03 01:17:28 UTC (rev 452)
+++ edu2/edu2-launcher.bat 2008-03-03 18:11:28 UTC (rev 453)
@@ -32,6 +32,7 @@
@ipconfig
@echo .
@echo Broadcast one of the IPs above to others who want to connect to your servers
+@pause
@goto :eof
:remoteservers
Modified: install/compressdir.bat
===================================================================
--- install/compressdir.bat 2008-03-03 01:17:28 UTC (rev 452)
+++ install/compressdir.bat 2008-03-03 18:11:28 UTC (rev 453)
@@ -1,6 +1,7 @@
-cd "%1"
-7z a -tzip -mx7 -ir0!*.* "..\%2.pk3"
-cd ..
-rmdir "%1" /S /Q
-mkdir "%1"
-move "%2.pk3" "%1\"
+@cd "%1"
+@7z a -tzip -mx7 -ir0!*.* "..\%2.pk3"
+@cd ..
+@if not exist "%2.pk3" goto :eof
+@rmdir "%1" /S /Q
+@mkdir "%1"
+@move "%2.pk3" "%1\"
Modified: install/gpl-2.0.txt
===================================================================
--- install/gpl-2.0.txt 2008-03-03 01:17:28 UTC (rev 452)
+++ install/gpl-2.0.txt 2008-03-03 18:11:28 UTC (rev 453)
@@ -6,56 +6,6 @@
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -278,62 +228,3 @@
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
Modified: install/readme.txt
===================================================================
--- install/readme.txt 2008-03-03 01:17:28 UTC (rev 452)
+++ install/readme.txt 2008-03-03 18:11:28 UTC (rev 453)
@@ -1,5 +1,5 @@
If you simply want to get edu2p to run and do not want to enter the world of pain, use the Start Menu to start it or start it by executing edu2-launcher.bat or edu2-offline-launcher.bat.
-You'll see a console-window that gives you all possibly interesting configurations that you would want edu2p to run with.
+You'll see a console window that gives you all possibly interesting configurations that you would want edu2p to run with.
Simply select the one that fits your needs and it should run out of the box.
If you want to test it with others, make one computer the server (either dedicated or dedicated + client), and tell the others the IP that is printed after you start the game (in the Edu2 Launcher window). The others then can open a remote game and enter that IP and it will configure edu1 and edu2 to connect to your server when needed.
Modified: install/script.iss
===================================================================
--- install/script.iss 2008-03-03 01:17:28 UTC (rev 452)
+++ install/script.iss 2008-03-03 18:11:28 UTC (rev 453)
@@ -47,7 +47,7 @@
Source: D:\Edu2\install\build\edu2-launcher.bat; DestDir: {app}; Flags: ignoreversion
Source: D:\Edu2\install\build\*; DestDir: {app}; Flags: ignoreversion recursesubdirs createallsubdirs
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-Source: readme.txt; DestDir: {app}; Flags: isreadme; Languages: ; Components:
+Source: readme.txt; DestDir: {app}; Languages: ; Components:
Source: edu2-offline-cache\*; DestDir: {app}\edu2-offline-cache; Flags: recursesubdirs ignoreversion; Components: " Offline_Cache"; Tasks: ; Languages:
Source: ..\offline\edu2-offline-launcher.bat; DestDir: {app}; Flags: ignoreversion; Components: Offline_Cache; Tasks:
Source: ..\edu2\edu1.exe; DestDir: {app}; Flags: ignoreversion
@@ -67,4 +67,4 @@
Name: {app}\*; Type: filesandordirs
[Types]
Name: onlineOnly; Description: Edu2 will only work properly with an Internet connection; Languages:
-Name: offlineSupport; Description: A webcache with required Internet content will be installed, too, allowing presentation of Edu2 without Internet access
+Name: offlineSupport; Description: A webcache with required Internet content will be installed, too; Languages:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
