Commits

Tuukka Norri committed 13c146c

Removed BXACurrentVersion.m.m4
- The functionality is now in BaseTen.

Comments (0)

Files changed (3)

BaseTenAssistant/BaseTenAssistant.xcodeproj/project.pbxproj

 		227A5F4F0E4C5E300009CC08 /* InspectorPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 227A5F4D0E4C5E300009CC08 /* InspectorPanel.xib */; };
 		2B66D97D0B1C664300F8C64A /* BaseTenModifications.sql.m4 in Resources */ = {isa = PBXBuildFile; fileRef = 2B66D97C0B1C664300F8C64A /* BaseTenModifications.sql.m4 */; };
 		5312A7970F584C560097DAA4 /* BaseTen Assistant Help in Resources */ = {isa = PBXBuildFile; fileRef = 5312A74C0F584C560097DAA4 /* BaseTen Assistant Help */; };
-		531C016C0E32AEC300E43208 /* BXACurrentVersion.m.m4 in Sources */ = {isa = PBXBuildFile; fileRef = 531C016B0E32AEC300E43208 /* BXACurrentVersion.m.m4 */; };
 		531DCABA0B52818E00200097 /* MKCAlternativeDataCellColumn.m in Sources */ = {isa = PBXBuildFile; fileRef = 531DCAB80B52818E00200097 /* MKCAlternativeDataCellColumn.m */; };
 		532F42A00D69B70F009FEDCD /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 532F429A0D69B70F009FEDCD /* MainMenu.xib */; };
 		53425B650E2CD237005F6123 /* MKCStackView.m in Sources */ = {isa = PBXBuildFile; fileRef = 53425B640E2CD237005F6123 /* MKCStackView.m */; };
 		2B66D97C0B1C664300F8C64A /* BaseTenModifications.sql.m4 */ = {isa = PBXFileReference; explicitFileType = text; fileEncoding = 5; name = BaseTenModifications.sql.m4; path = ../Resources/BaseTenModifications.sql.m4; sourceTree = SOURCE_ROOT; };
 		530D557B0E489F0A006BDEB2 /* InterfaceBuilderPlugin.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = InterfaceBuilderPlugin.xcodeproj; path = ../InterfaceBuilderPlugin/InterfaceBuilderPlugin.xcodeproj; sourceTree = SOURCE_ROOT; };
 		5312A74D0F584C560097DAA4 /* English */ = {isa = PBXFileReference; lastKnownFileType = folder; name = English; path = "English.lproj/BaseTen Assistant Help"; sourceTree = "<group>"; };
-		531C016B0E32AEC300E43208 /* BXACurrentVersion.m.m4 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = BXACurrentVersion.m.m4; path = Sources/BXACurrentVersion.m.m4; sourceTree = "<group>"; };
 		531DCAB70B52818E00200097 /* MKCAlternativeDataCellColumn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MKCAlternativeDataCellColumn.h; path = Sources/MKCAlternativeDataCellColumn.h; sourceTree = "<group>"; };
 		531DCAB80B52818E00200097 /* MKCAlternativeDataCellColumn.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MKCAlternativeDataCellColumn.m; path = Sources/MKCAlternativeDataCellColumn.m; sourceTree = "<group>"; };
 		532F429B0D69B70F009FEDCD /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
 		29B97315FDCFA39411CA2CEA /* Other Sources */ = {
 			isa = PBXGroup;
 			children = (
-				531C016B0E32AEC300E43208 /* BXACurrentVersion.m.m4 */,
 				538963150EF2A480004391BF /* BXAPortFormatter.h */,
 				538963160EF2A480004391BF /* BXAPortFormatter.m */,
 				5374E4B60B0D364E000D353D /* Additions.h */,
 				53DAF3D00E2BC40200085C3E /* BXAPGInterface.m in Sources */,
 				53425B650E2CD237005F6123 /* MKCStackView.m in Sources */,
 				53C80FEF0E31413300302B3F /* MKCEventPassingTextField.m in Sources */,
-				531C016C0E32AEC300E43208 /* BXACurrentVersion.m.m4 in Sources */,
 				227A5CE40E4BC2EB0009CC08 /* BXAGetInfoWindowController.m in Sources */,
 				227A5F4C0E4C5B9D0009CC08 /* BXAInspectorPanelController.m in Sources */,
 				538963170EF2A480004391BF /* BXAPortFormatter.m in Sources */,

BaseTenAssistant/Sources/BXAController.m

 #import <RegexKit/RegexKit.h>
 
 
-extern NSNumber* BXACopyBundledVersionNumber ();
-
-
 static NSString* kBXAControllerCtx = @"kBXAControllerCtx";
 static NSString* kBXAControllerErrorDomain = @"kBXAControllerErrorDomain";
 
 {
 	gController = self;
 	mLastSelectedEntityWasView = YES;
-	mBundledSchemaVersionNumber = BXACopyBundledVersionNumber ();
+	mBundledSchemaVersionNumber = [[BXPGVersion currentVersionNumber] retain];
 
 	//Patch by Tim Bedford 2008-08-11
 	[mMainWindow setExcludedFromWindowsMenu:YES];

BaseTenAssistant/Sources/BXACurrentVersion.m.m4

-//
-// BXACurrentVersion.m.m4
-// BaseTen Setup
-//
-// Copyright (C) 2006-2008 Marko Karppinen & Co. LLC.
-//
-// Before using this software, please review the available licensing options
-// by visiting http://basetenframework.org/licensing/ or by contacting
-// us at sales@karppinen.fi. Without an additional license, this software
-// may be distributed only in compliance with the GNU General Public License.
-//
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License, version 2.0,
-// as published by the Free Software Foundation.
-//
-// 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 St, Fifth Floor, Boston, MA  02110-1301  USA
-//
-// $Id$
-//
-
-#import <Foundation/Foundation.h>
-
-//FIXME: this may be removed in the future since the function now exists in BaseTen.
-
-divert(-1)
-include(`../Resources/BaseTenModifications.sql.m4')
-divert(0)dnl
-
-NSNumber*
-BXACopyBundledVersionNumber ()
-{
-    return [[NSDecimalNumber alloc] initWithString: @"_bx_version_"];
-}
-
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.