SF.net SVN: geany: [649] trunk

[eht16 at users.sourceforge.net]

Revision: 649
Author:   eht16
Date:     2006-07-29 01:45:37 -0700 (Sat, 29 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/geany/?rev=649&view=rev

Log Message:
-----------
Removed geany_windres.rc.in, use geany_private.rc instead.

Modified Paths:
--------------
    trunk/Makefile.am
    trunk/configure.in
    trunk/src/Makefile.am

Removed Paths:
-------------
    trunk/geany_windres.rc.in
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2006-07-29 08:35:38 UTC (rev 648)
+++ trunk/Makefile.am	2006-07-29 08:45:37 UTC (rev 649)
@@ -7,7 +7,7 @@
 	geany.desktop.in \
 	geany.spec \
 	geany.glade \
-	geany_windres.rc \
+	geany_private.rc \
 	geany.gladep \
 	data/global.tags \
 	data/php.tags \
@@ -51,19 +51,6 @@
 	  done \
 	fi
 
-if MINGW
-install-win32:
-	GEANY_INSTALL_DIR=geany; \
-	mkdir $(GEANY_INSTALL_DIR); \
-	cp ChangeLog $(GEANY_INSTALL_DIR)/ChangeLog.txt; \
-	cp TODO $(GEANY_INSTALL_DIR)/ToDo.txt; \
-	cp COPYING $(GEANY_INSTALL_DIR)/ChangeLog.txt; \
-	cp AUTHORS $(GEANY_INSTALL_DIR)/Authors.txt; \
-	cp README $(GEANY_INSTALL_DIR)/ReadMe.txt; \
-	cp THANKS $(GEANY_INSTALL_DIR)/Thanks.txt; \
-	@# to be finished
-endif
-
 BZIP2_ENV =--best
 
 dist-bzip2: distdir

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-07-29 08:35:38 UTC (rev 648)
+++ trunk/configure.in	2006-07-29 08:45:37 UTC (rev 649)
@@ -169,7 +169,6 @@
 doc/geany.1
 geany.spec
 geany.desktop
-geany_windres.rc
 ])
 
 echo "----------------------------------------"

Deleted: trunk/geany_windres.rc.in
===================================================================
--- trunk/geany_windres.rc.in	2006-07-29 08:35:38 UTC (rev 648)
+++ trunk/geany_windres.rc.in	2006-07-29 08:45:37 UTC (rev 649)
@@ -1,32 +0,0 @@
-
-#include <windows.h> // include for version info constants
-
-
-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../pixmaps/geany.ico"
-
-1 VERSIONINFO
-FILEVERSION @MAJOR_VERSION@, at MINOR_VERSION@,0,0
-PRODUCTVERSION @MAJOR_VERSION@, at MINOR_VERSION@,0,0
-FILETYPE VFT_APP
-{
-  BLOCK "StringFileInfo"
-	 {
-		 BLOCK "040704E4"
-		 {
-			 VALUE "CompanyName", ""
-			 VALUE "FileVersion", "@VERSION_STRING@"
-			 VALUE "FileDescription", "Small and lightweight IDE (built using mingw gcc)"
-			 VALUE "InternalName", "geany"
-			 VALUE "LegalCopyright", "Copyright 2005-2006 by Enrico Troeger"
-			 VALUE "LegalTrademarks", ""
-			 VALUE "OriginalFilename", "geany"
-			 VALUE "ProductName", "geany"
-			 VALUE "ProductVersion", "@VERSION_STRING@"
-		 }
-	 }
-  BLOCK "VarFileInfo"
-	 {
-		 VALUE "Translation", 0x0407, 1252
-	 }
-}
-

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2006-07-29 08:35:38 UTC (rev 648)
+++ trunk/src/Makefile.am	2006-07-29 08:45:37 UTC (rev 649)
@@ -39,7 +39,7 @@
 geany_SOURCES = $(SRCS) win32.c win32.h
 geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a -lstdc++ @PACKAGE_LIBS@ \
 			$(INTLLIBS) -lgdi32 -limm32 -lshell32 -lole32 -luuid -liberty -lcomdlg32 -lcomctl32 \
-			geany_windres.res
+			geany_private.res
 AM_CFLAGS = -DGEANY_DEBUG -Wall -pipe -mms-bitfields
 #AM_CFLAGS = -DGEANY_DEBUG -Wall -pipe -mms-bitfields -g -O0
 geany_LDFLAGS =	-mwindows
@@ -48,10 +48,10 @@
            -I/usr/local/cross-tools/include @PACKAGE_CFLAGS@
 
 geany_windres.res:
-	$(WINDRES) -i ../geany_windres.rc --input-format=rc -o geany_windres.res -O coff;
+	$(WINDRES) -i ../geany_private.rc --input-format=rc -o geany_private.res -O coff;
 
 clean-local:
-	rm -f geany_windres.res
+	rm -f geany_private.res
 
 else
 # build Geany for all other platforms


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.