more -V output

and some small cleanups

Author: jcupitt

ChangeLog

@@ -1,5 +1,6 @@
 started 8.7.0 22/5/18
 - added vips7compat.h include for libvips 8.7
+- more output for -V to help debugging CLI mode
 
 started 8.6.1 1/5/18
 - better enum display in header

nip2.appdata.xml

@@ -22,8 +22,8 @@
   </p>
  </description>
  <screenshots>
-   <screenshot type="default" width="800" height="450">http://www.vips.ecs.soton.ac.uk/images/thumb/Nip2-7.36.png/800px-Nip2-7.36.png</screenshot>
+   <screenshot type="default" width="739" height="534">https://raw.githubusercontent.com/jcupitt/nip2/master/doc/src/figs/snap1.jpg</screenshot>
  </screenshots>
- <url type="homepage">http://www.vips.ecs.soton.ac.uk</url>
+ <url type="homepage">https://jcupitt.github.io/libvips</url>
  <updatecontact>https://github.com/jcupitt/nip2</updatecontact>
 </application>

nip2.spec.in

@@ -5,8 +5,8 @@ Summary:	Interactive tool for working with large images
 
 Group:		Applications/Multimedia
 License:	GPLv2+
-URL:		http://www.vips.ecs.soton.ac.uk/
-Source0:	http://www.vips.ecs.soton.ac.uk/supported/7.14/%{name}-%{version}.tar.gz
+URL:		https://github.com/jcupitt/nip2
+Source0:	https://github.com/jcupitt/nip2/releases
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,9 +33,6 @@ GIMP should be used instead.
 %prep
 %setup -q
 
-# CVS dirs
-find . -name CVS -type d -print0 | xargs -0 rm -rf
-
 
 %build
 %configure
@@ -120,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jun 10 2008 John Cupitt <[email protected]> - 8.7.0
+- Update URLs
+
 * Sat Jul 19 2008 Jesper Friis <jesper.friis(at)sintef.no> - 7.15.0-1
 - Added this spec file from the Fedora source rpm
 

src/ip.h

@@ -180,6 +180,10 @@ extern int statfs();
  */
 #include "nipmarshal.h"
 
+/* XML namespace ... note, not nip2! We can't change this.
+ */
+#define NAMESPACE "http://www.vips.ecs.soton.ac.uk/nip" 
+
 #define MAXFILES (4000)		/* Max. no of files in path */
 #define STACK_SIZE (1000)	/* Depth of eval stack */
 #define LEN_LABEL (512)		/* Label on windows */
@@ -189,18 +193,16 @@ extern int statfs();
 #define MAX_STRSIZE (100000)	/* Size of text for user defs */
 #define MAX_TRACE (1024)	/* Biggest thing we print in trace */
 #define MAX_SSTACK (40)		/* Scope stack for parser */
-#define VIPS_HOMEPAGE "http://www.vips.ecs.soton.ac.uk"
+#define VIPS_HOMEPAGE "https://github.com/jcupitt/nip2"
 #define IP_NAME PACKAGE "-" VERSION
 #define NIP_DOCPATH "$VIPSHOME" G_DIR_SEPARATOR_S "share" G_DIR_SEPARATOR_S \
         "doc" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "html"
 #define VIPS_DOCPATH "$VIPSHOME" G_DIR_SEPARATOR_S "share" G_DIR_SEPARATOR_S \
 	"doc" G_DIR_SEPARATOR_S "vips" G_DIR_SEPARATOR_S "html"
 #define IP_NAME PACKAGE "-" VERSION
-#define NAMESPACE VIPS_HOMEPAGE "/" "nip" 
-				/* XML namespace ... note, not nip2! */
 #define MAX_LINELENGTH (120)	/* Max chars we display of value */
 #define MAX_RECENT (10)		/* Number of recent items in file menu */
-#define NIP_COPYRIGHT "%s: ©2017 Imperial College, London"
+#define NIP_COPYRIGHT "%s: ©2018 Imperial College, London"
 
 /* Our stock_ids.
  */

src/main.c

@@ -94,9 +94,9 @@ static gboolean main_option_benchmark = FALSE;
 gboolean main_option_time_save = FALSE;
 gboolean main_option_profile = FALSE;
 gboolean main_option_i18n = FALSE;
+gboolean main_option_verbose = FALSE;
 static gboolean main_option_print_main = FALSE;
 static gboolean main_option_version = FALSE;
-static gboolean main_option_verbose = FALSE;
 static gboolean main_option_test = FALSE;
 static char *main_option_prefix = NULL;
 
@@ -908,10 +908,6 @@ main_set( const char *str )
 {
 	Symbol *sym;
 
-#ifdef DEBUG
-	printf( "main_set: %s\n", str );
-#endif /*DEBUG*/
-
 	attach_input_string( str );
 	if( !(sym = parse_set_symbol()) ) 
 		return( FALSE );
@@ -1485,9 +1481,14 @@ main( int argc, char *argv[] )
 	if( main_option_set ) {
 		int i;
 
-		for( i = 0; main_option_set[i]; i++ ) 
+		for( i = 0; main_option_set[i]; i++ ) {
+			if( main_option_verbose ) 
+				printf( "main_set: %s\n", main_option_set[i] );
+
 			if( !main_set( main_option_set[i] ) )
-				main_log_add( "%s\n", error_get_sub() );
+				main_log_add( "%s\n%s", 
+					error_get_top(), error_get_sub() );
+		}
 	}
 
 	/* Make sure our start ws doesn't have modified set. We may have

src/main.h

@@ -41,6 +41,7 @@ extern gboolean main_option_time_save;		/* Time save image ops */
 extern gboolean main_option_profile;		/* Profile calcualtion */
 extern gboolean main_option_i18n;		/* Output i18n strings */
 extern gboolean main_option_batch;		/* Running in batch mode */
+extern gboolean main_option_verbose;		/* Verbose output */
 
 /* Styles for buttons etc.
  */