diff --git a/harbour/COPYING b/harbour/COPYING index 1ea2f56bd8..27a1b2b697 100644 --- a/harbour/COPYING +++ b/harbour/COPYING @@ -85,7 +85,7 @@ Note: This license only applies to the following files: ChangeLog INSTALL - doc/whatsnew.txt + NEWS These works are licensed under the Creative Commons Attribution-ShareAlike License. To view a copy of this license, visit diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 265d4113b0..cdd9a79e06 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,9 +16,58 @@ The license applies to all entries newer than 2009-04-28. */ +2010-07-30 00:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * debian/dirs + ! Deleted doc/en dir. + + * doc/Makefile + - doc/whatsnew.txt + + NEWS + * COPYING + * doc/howtorel.txt + * debian/changelog + * package/mpkg_win.nsi + * package/winuni/mpkg_win_uni.bat + * package/winuni/mpkg_win_uni.nsi + * Renamed doc/whatsnew.txt to /NEWS + + * debian/copyright + * Updated with COPYING content. + + * package/harbour.spec + ! Fixed to include doc/* instead of doc/*.txt. + + * utils/hbrun/hbrun.prg + - Deleted envvar method of passing dirbase to scripts. + + * contrib/make.hbs + + Using HBRUN_DIRBASE() function instead of envvar trick. + Maybe some more generic named value passing would be better. + + * contrib/Makefile + ! Using '-' prefix when running hbrun instead of '+', to not + cause fatal breakage in build stage if make.hbs contains + something which previous build of hbrun didn't offer. + + * config/global.mk + - HB_INSTALL_PREFIX will not default anymore to source root + dir (on non-*nix systems) to avoid FAQ where installation + fails because of former install into source root, causing + old contrib headers to ovveride current ones and breaking + build. Please note that 'install' is truly optional with + current builds, so only use it for what it was designed. + Pls should if some things fail with empty HB_INSTALL_PREFIX + and requesting 'install' anyway. + + * contrib/xhb/xhbat.c + ! Applied this fix to Harbour: + 2010-07-29 12:28 UTC-0430 Ron Pinkas + * source/rtl/at.c + + Added missing extended strings support, to hb_AtSkipStrings() + 2010-07-29 19:37 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) * harbour/contrib/rddads/adsx.c - ! fixed RDDNAME() value by implementing newarea RDD method + ! fixed RDDNAME() value by implementing newarea RDD method + ADSVFPX RDD * harbour/contrib/rddads/rddads.hbp ! fixed ACE library name for linux diff --git a/harbour/doc/whatsnew.txt b/harbour/NEWS similarity index 100% rename from harbour/doc/whatsnew.txt rename to harbour/NEWS diff --git a/harbour/config/global.mk b/harbour/config/global.mk index 9bb1aed52c..bfb8bae329 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -1498,11 +1498,13 @@ else HB_INSTALL_PREFIX := /boot/common else ifeq ($(HB_PLATFORM_UNIX),) - ifneq ($(HB_SRC_ROOTPATH),) - HB_INSTALL_PREFIX := $(HB_SRC_ROOTPATH) - else - HB_INSTALL_PREFIX := $(realpath $(TOP)$(ROOT)) - endif + # Do nothing. There was logic which set the install dir to + # the root of the source tree, but in practice it often caused + # build breakage because of old contrib headers being installed + # into central header dir and picked up instead of current ones + # inside contrib directories. Anyways with recent Harbour there + # no pressing need to use 'install', so I've removed this + # defaulting logic. [vszakats] else ifneq ($(PREFIX),) HB_INSTALL_PREFIX := $(PREFIX) diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile index b756e1b579..ccf169b125 100644 --- a/harbour/contrib/Makefile +++ b/harbour/contrib/Makefile @@ -9,6 +9,6 @@ include $(ROOT)config/global.mk ifneq ($(HB_NO_HBSCRIPT),yes) first clean install:: - $(if $(wildcard $(HB_HOST_BIN_DIR)/hbrun$(HB_HOST_BIN_EXT)),+$(HB_HOST_BIN_DIR)/hbrun$(HB_HOST_BIN_EXT) --hb:gtcgi $(TOP)$(ROOT)contrib/make.hbs $@,@$(ECHO) $(ECHOQUOTE)! Warning: hbrun not found, contrib/make.hbs skipped.$(ECHOQUOTE)) + $(if $(wildcard $(HB_HOST_BIN_DIR)/hbrun$(HB_HOST_BIN_EXT)),-$(HB_HOST_BIN_DIR)/hbrun$(HB_HOST_BIN_EXT) --hb:gtcgi $(TOP)$(ROOT)contrib/make.hbs $@,@$(ECHO) $(ECHOQUOTE)! Warning: hbrun not found, contrib/make.hbs skipped.$(ECHOQUOTE)) endif diff --git a/harbour/contrib/make.hbs b/harbour/contrib/make.hbs index 9b4b82d383..86c510cddf 100755 --- a/harbour/contrib/make.hbs +++ b/harbour/contrib/make.hbs @@ -76,7 +76,7 @@ PROCEDURE Main( ... ) s_cRoot := s_cHome + "../" #if defined( __HBSCRIPT__HBRUN ) - s_cBinDir := PathSepToSelf( GetEnv( "__HBRUN__DIRBASE" ) ) + s_cBinDir := hbrun_DirBase() #else s_cBinDir := hb_DirBase() #endif diff --git a/harbour/contrib/xhb/xhbat.c b/harbour/contrib/xhb/xhbat.c index 4f8e6dcaee..e79cf0e7d7 100644 --- a/harbour/contrib/xhb/xhbat.c +++ b/harbour/contrib/xhb/xhbat.c @@ -70,6 +70,20 @@ HB_SIZE hb_AtSkipStrings( const char * szSub, HB_SIZE nSubLen, const char * szTe while( nPos < nLen && nSubPos < nSubLen ) { + if( szText[ nPos + 1 ] == '"' && ( szText[ nPos ] == 'e' || szText[ nPos ] == 'E' ) ) + { + nPos++; + + while( ++nPos < nLen && ( szText[ nPos ] != '"' || szText[ nPos - 1 ] == '\\' ) ) + { + /* Skip. */ + } + + nPos++; + nSubPos = 0; + continue; + } + if( szText[ nPos ] == '"' && szSub[ 0 ] != '"' ) { while( ++nPos < nLen && szText[ nPos ] != '"' ) diff --git a/harbour/debian/changelog b/harbour/debian/changelog index d6c59f1ff7..e8130a79a1 100644 --- a/harbour/debian/changelog +++ b/harbour/debian/changelog @@ -18,7 +18,7 @@ harbour (2.0.0beta1-1) unstable; urgency=low harbour (1.0.1-1) unstable; urgency=low - * Please see doc/whatsnew.txt + * Please see NEWS -- Viktor Szakats Tue, 16 Sep 2008 14:54:38 +0200 diff --git a/harbour/debian/copyright b/harbour/debian/copyright index 1334cb6d1e..27a1b2b697 100644 --- a/harbour/debian/copyright +++ b/harbour/debian/copyright @@ -2,7 +2,7 @@ THE HARBOUR PROJECT COMPILER LICENSE ==================================== Note: This license applies to most of the files in the src/compiler - and utils/hbmk2 directories. + and utils/hbmk2 directories and certain .hbs Harbour scripts. 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 @@ -85,7 +85,7 @@ Note: This license only applies to the following files: ChangeLog INSTALL - doc/whatsnew.txt + NEWS These works are licensed under the Creative Commons Attribution-ShareAlike License. To view a copy of this license, visit @@ -541,3 +541,353 @@ available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of the License. Creative Commons may be contacted at http://creativecommons.org/. + + +GNU GENERAL PUBLIC LICENSE VERSION 2 +==================================== + +Binary tools included in Harbour source repository +all use GNU GPL 2. Find it below: + +------------------------------------------------------------------------ + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. + 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 Library 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 + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: 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. + + + Copyright (C) 19yy + + 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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) 19yy 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. + + , 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 Library General +Public License instead of this License. diff --git a/harbour/debian/dirs b/harbour/debian/dirs index f40328cc39..2bf0af0176 100644 --- a/harbour/debian/dirs +++ b/harbour/debian/dirs @@ -3,4 +3,3 @@ usr/bin usr/lib/harbour usr/include/harbour usr/share/doc/harbour -usr/share/doc/harbour/en diff --git a/harbour/doc/Makefile b/harbour/doc/Makefile index 71e7146793..5213ea5a7b 100644 --- a/harbour/doc/Makefile +++ b/harbour/doc/Makefile @@ -29,7 +29,6 @@ DOC_FILES := \ tracing.txt \ transfrm.txt \ vm.txt \ - whatsnew.txt \ windll.txt \ include $(TOP)$(ROOT)config/doc.mk diff --git a/harbour/doc/howtorel.txt b/harbour/doc/howtorel.txt index b60b025432..db17ea7ab1 100644 --- a/harbour/doc/howtorel.txt +++ b/harbour/doc/howtorel.txt @@ -17,7 +17,7 @@ By Przemyslaw Czerpak (druzus/at/priv.onet.pl) 2. Update files which contain harbour release number. Now these are: harbour.spec include/hbver.h -3. Set proper release date in whatsnew.txt and if necessary update +3. Set proper release date in NEWS and if necessary update release informations. Also add the exact tag name to this file, for example "tag: build46". 4. Update ChangeLog file and commit your modifications. @@ -40,4 +40,3 @@ tagged as new release. The first commit after cvs tagging should also change the version number and ChangeLog IDs in harbour.spec and include/hbver.h for easier locating possible mistakes when release binaries are created. - diff --git a/harbour/package/harbour.spec b/harbour/package/harbour.spec index 1d45d517fe..6ca0607b50 100644 --- a/harbour/package/harbour.spec +++ b/harbour/package/harbour.spec @@ -443,7 +443,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,755) %doc ChangeLog* -%doc doc/*.txt +%doc doc/* %dir %{hb_etcdir} %verify(not md5 mtime) %config %{hb_etcdir}/hb-charmap.def diff --git a/harbour/package/mpkg_win.nsi b/harbour/package/mpkg_win.nsi index e20e886ed9..f7ada9bcac 100644 --- a/harbour/package/mpkg_win.nsi +++ b/harbour/package/mpkg_win.nsi @@ -78,6 +78,7 @@ Section "Main components" hb_main File /nonfatal "$%HB_INSTALL_PREFIX%\COPYING" File /nonfatal "$%HB_INSTALL_PREFIX%\INSTALL" + File /nonfatal "$%HB_INSTALL_PREFIX%\NEWS" File /nonfatal "$%HB_INSTALL_PREFIX%\TODO" ; Let it work also for DOS packages where short filename is used here File /nonfatal "$%HB_INSTALL_PREFIX%\Change*" diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat index a7213342a7..545944fc1a 100644 --- a/harbour/package/winuni/mpkg_win_uni.bat +++ b/harbour/package/winuni/mpkg_win_uni.bat @@ -17,6 +17,7 @@ echo.> _hbfiles echo "hb21\RELNOTES" >> _hbfiles echo "hb21\INSTALL" >> _hbfiles echo "hb21\COPYING" >> _hbfiles +echo "hb21\NEWS" >> _hbfiles echo "hb21\TODO" >> _hbfiles echo "hb21\ChangeLog*" >> _hbfiles echo "hb21\bin\harbour-20.dll" >> _hbfiles diff --git a/harbour/package/winuni/mpkg_win_uni.nsi b/harbour/package/winuni/mpkg_win_uni.nsi index be18f9db02..c921a7a9af 100644 --- a/harbour/package/winuni/mpkg_win_uni.nsi +++ b/harbour/package/winuni/mpkg_win_uni.nsi @@ -92,6 +92,7 @@ Section "Main components" hb_main File /nonfatal "$%HB_ROOT%hb21\INSTALL" File /nonfatal "$%HB_ROOT%hb21\COPYING" + File /nonfatal "$%HB_ROOT%hb21\NEWS" File /nonfatal "$%HB_ROOT%hb21\TODO" File /nonfatal "$%HB_ROOT%hb21\ChangeLog*" diff --git a/harbour/utils/hbrun/hbrun.prg b/harbour/utils/hbrun/hbrun.prg index e6f0598d4f..2dceaf979c 100644 --- a/harbour/utils/hbrun/hbrun.prg +++ b/harbour/utils/hbrun/hbrun.prg @@ -143,7 +143,6 @@ PROCEDURE _APPMAIN( cFile, ... ) ENDIF OTHERWISE s_cDirBase := hb_DirBase() - hb_setenv( "__HBRUN__DIRBASE", s_cDirBase ) hb_argShift( .T. ) hb_hrbRun( cFile, ... ) EXIT @@ -156,6 +155,7 @@ PROCEDURE _APPMAIN( cFile, ... ) RETURN +/* Public hbrun API */ FUNCTION hbrun_DirBase() RETURN s_cDirBase