← Back to team overview

zorba-coders team mailing list archive

[Merge] lp:~zorba-coders/zorba/gen_all_props_update into lp:zorba

 

Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/gen_all_props_update into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Sorin Marian Nasoi (sorin.marian.nasoi)
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen_all_props_update/+merge/95035

Updated the NOTICE inside scripts/gen_all_props.
This is a temporary fix, until bug lp:867335 is fixed (and so the scripts/gen_all_props will be replaced with an XQuery generation).
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen_all_props_update/+merge/95035
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'bin/zorbacmdproperties_base.h'
--- bin/zorbacmdproperties_base.h	2012-02-27 07:33:38 +0000
+++ bin/zorbacmdproperties_base.h	2012-02-28 20:03:23 +0000
@@ -15,12 +15,13 @@
  */
 /* vim:set et sw=2 ts=2: */
 
-// ******************************************
-// *                                        *
-// * THIS IS A GENERATED FILE. DO NOT EDIT! *
-// * SEE .txt FILE WITH SAME NAME           *
-// *                                        *
-// ******************************************
+// ******************************************************
+// *                                                    *
+// * THIS IS A GENERATED FILE. DO NOT EDIT!             *
+// * SEE .txt FILE WITH SAME NAME but remember          *
+// * at the end to execute script scripts/gen_all_props *
+// *                                                    *
+// ******************************************************
 
 #include <string>
 #include <sstream>

=== modified file 'scripts/gen_all_props'
--- scripts/gen_all_props	2009-10-30 16:24:51 +0000
+++ scripts/gen_all_props	2012-02-28 20:03:23 +0000
@@ -15,12 +15,13 @@
 
 add_notice () {
 echo
-echo '// ******************************************'
-echo '// *                                        *'
-echo '// * THIS IS A GENERATED FILE. DO NOT EDIT! *'
-echo '// * SEE .txt FILE WITH SAME NAME           *'
-echo '// *                                        *'
-echo '// ******************************************'
+echo '// ******************************************************'
+echo '// *                                                    *'
+echo '// * THIS IS A GENERATED FILE. DO NOT EDIT!             *'
+echo '// * SEE .txt FILE WITH SAME NAME but remember          *'
+echo '// * at the end to execute script scripts/gen_all_props *'
+echo '// *                                                    *'
+echo '// ******************************************************'
 echo
 }
 

=== modified file 'src/store/naive/store_properties.h'
--- src/store/naive/store_properties.h	2012-02-17 11:54:24 +0000
+++ src/store/naive/store_properties.h	2012-02-28 20:03:23 +0000
@@ -15,12 +15,13 @@
  */
 /* vim:set et sw=2 ts=2: */
 
-// ******************************************
-// *                                        *
-// * THIS IS A GENERATED FILE. DO NOT EDIT! *
-// * SEE .txt FILE WITH SAME NAME           *
-// *                                        *
-// ******************************************
+// ******************************************************
+// *                                                    *
+// * THIS IS A GENERATED FILE. DO NOT EDIT!             *
+// * SEE .txt FILE WITH SAME NAME but remember          *
+// * at the end to execute script scripts/gen_all_props *
+// *                                                    *
+// ******************************************************
 
 #include <string>
 #include <sstream>

=== modified file 'src/system/zorba_properties.h'
--- src/system/zorba_properties.h	2012-02-17 11:54:24 +0000
+++ src/system/zorba_properties.h	2012-02-28 20:03:23 +0000
@@ -15,12 +15,13 @@
  */
 /* vim:set et sw=2 ts=2: */
 
-// ******************************************
-// *                                        *
-// * THIS IS A GENERATED FILE. DO NOT EDIT! *
-// * SEE .txt FILE WITH SAME NAME           *
-// *                                        *
-// ******************************************
+// ******************************************************
+// *                                                    *
+// * THIS IS A GENERATED FILE. DO NOT EDIT!             *
+// * SEE .txt FILE WITH SAME NAME but remember          *
+// * at the end to execute script scripts/gen_all_props *
+// *                                                    *
+// ******************************************************
 
 #include <string>
 #include <sstream>


Follow ups