From 9406c8b24f30975e1fb1c5e041c7c1a758b4713a Mon Sep 17 00:00:00 2001 From: Myungjae Lee Date: Wed, 9 Mar 2011 11:07:16 +0900 Subject: [PATCH] svn update: 57246 (latest:57246) --- ChangeLog | 4 + autogen.sh | 7 +- configure.ac | 6 +- embryo.spec.in | 2 +- win32/MANIFEST.txt | 15 --- win32/README.txt | 10 -- win32/common/config.h | 28 ----- win32/start.bat | 67 ------------ win32/vs8/embryo.sln | 20 ---- win32/vs8/libembryo.vcproj | 243 ------------------------------------------ win32/vs9/embryo.sln | 29 ------ win32/vs9/embryo_cc.vcproj | 255 --------------------------------------------- win32/vs9/libembryo.vcproj | 242 ------------------------------------------ 13 files changed, 10 insertions(+), 918 deletions(-) delete mode 100644 win32/MANIFEST.txt delete mode 100644 win32/README.txt delete mode 100644 win32/common/config.h delete mode 100644 win32/start.bat delete mode 100644 win32/vs8/embryo.sln delete mode 100644 win32/vs8/libembryo.vcproj delete mode 100644 win32/vs9/embryo.sln delete mode 100644 win32/vs9/embryo_cc.vcproj delete mode 100644 win32/vs9/libembryo.vcproj diff --git a/ChangeLog b/ChangeLog index e69de29..304e652 100644 --- a/ChangeLog +++ b/ChangeLog @@ -0,0 +1,4 @@ +2011-01-29 Carsten Haitzler (The Rasterman) + + 1.0.0 release + diff --git a/autogen.sh b/autogen.sh index 75501bc..6499736 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,16 +1,13 @@ #!/bin/sh -rm -rf autom4te.cache -rm -f aclocal.m4 ltmain.sh - touch README -echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4|| exit 1 +echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1 echo "Running autoheader..." ; autoheader || exit 1 echo "Running autoconf..." ; autoconf || exit 1 echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1 if [ -z "$NOCONFIGURE" ]; then - ./configure "$@" + ./configure -C "$@" fi diff --git a/configure.ac b/configure.ac index bca98e2..6f28191 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,11 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [1]) m4_define([v_min], [0]) -m4_define([v_mic], [0]) +m4_define([v_mic], [999]) m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) ##-- When released, remove the dnl on the below line -m4_undefine([v_rev]) +dnl m4_undefine([v_rev]) ##-- When doing snapshots - change soname. remove dnl on below line dnl m4_define([relname], [ver-pre-svn-07]) dnl m4_define([v_rel], [-release ver-pre-svn-07]) @@ -18,7 +18,7 @@ m4_define([lt_age], v_min) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## -AC_INIT([embryo], [v_ver.beta3], [enlightenment-devel@lists.sourceforge.net]) +AC_INIT([embryo], [v_ver], [enlightenment-devel@lists.sourceforge.net]) AC_PREREQ([2.52]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/embryo.spec.in b/embryo.spec.in index 0f2330e..620cee9 100644 --- a/embryo.spec.in +++ b/embryo.spec.in @@ -72,6 +72,6 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT %{_libdir}/*.la %{_libdir}/*.a %{_libdir}/pkgconfig/* -%{_includedir}/*.h +%{_includedir}/embryo-1/*.h %changelog diff --git a/win32/MANIFEST.txt b/win32/MANIFEST.txt deleted file mode 100644 index f13549c..0000000 --- a/win32/MANIFEST.txt +++ /dev/null @@ -1,15 +0,0 @@ - - This folder content: - - vs8 - Visual Studio 8 project files - embryo.sln - Embryo MSVC solution - libembryo.vcproj - libembryo project - - vs9 - Visual Studio 9 project files - embryo.sln - Embryo MSVC solution - libembryo.vcproj - libembryo project - embryo_cc.vcproj - embryo_cc project - - start.bat - batch script to start work with the solution - MANIFEST.txt - this file - README.txt - about this folder diff --git a/win32/README.txt b/win32/README.txt deleted file mode 100644 index 2cc2874..0000000 --- a/win32/README.txt +++ /dev/null @@ -1,10 +0,0 @@ - This folder contains Microsoft Visual Studio projects and some sources for - building Embryo. - -Important: - - Do not launch manually any solutions or projects in the folder, to start - a solution run the start.bat script, it will setup environment for - projects and will check system requirements. start.bat will detect - automatically the version of Visual Studio which is installed. It - currently supports Visual Studio 2005 and 2008. diff --git a/win32/common/config.h b/win32/common/config.h deleted file mode 100644 index a2c3b37..0000000 --- a/win32/common/config.h +++ /dev/null @@ -1,28 +0,0 @@ -/* EINA - EFL data type library - * Copyright (C) 2008 Cedric Bail - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; - * if not, see . - */ - -#ifndef EMBRYO_CONFIG_H_ -#define EMBRYO_CONFIG_H_ - - -#define VMAJ 1 -#define VMIN 0 -#define VMIC 0 -#define VREV 0 - -#endif /* EMBRYO_CONFIG_H_ */ diff --git a/win32/start.bat b/win32/start.bat deleted file mode 100644 index 68fbf56..0000000 --- a/win32/start.bat +++ /dev/null @@ -1,67 +0,0 @@ -@echo off - -rem Set external libraries directory. -set EXT_DIR=%cd%\..\..\..\extern - -if not exist %EXT_DIR% ( - set EXT_DIR= - echo ERROR: External libs dir is not set. - pause - goto END -) - -rem Check for basic requirements for Visual Studio 2008 -if "%VS90COMNTOOLS%" == "" ( - echo ERROR: Microsoft Visual Studio 2008 is not installed. - pause - goto NOVS9 -) - -set PROJECT_TYPE=vs9 -set VSCOMMONTOOLS=%VS90COMNTOOLS%vsvars32.bat - -goto STARTVS - -:NOVS9 - -rem Check for basic requirements for Visual Studio 2005 -if "%VS80COMNTOOLS%" == "" ( - echo ERROR: Microsoft Visual Studio 2005 is not installed. - pause - goto END -) - -set PROJECT_TYPE=vs8 -set VSCOMMONTOOLS=%VS80COMNTOOLS%vsvars32.bat - -:STARTVS - -rem Setup common Win32 environment variables - -rem Add Evil lib path -set EvilInclude=%cd%\..\..\evil\src\lib -set EvilCommon=%cd%\..\..\evil\win32\common -set EvilOut=%cd%\..\..\evil\win32\%PROJECT_TYPE%\out - -set INCLUDE=%EvilCommon%;%EvilInclude%;%EvilInclude%\dlfcn;%INCLUDE% -set LIB=%EvilOut%;%LIB% - -rem Add installation directory pathes. -set INCLUDE=%EXT_DIR%\include;%INCLUDE% -set LIB=%EXT_DIR%\lib;%LIB% - -set INCLUDE=%cd%\common;%cd%\..\src\lib;%INCLUDE% - -set SolutionDirectory=%cd%\%PROJECT_TYPE% -set DebugOutputDirectory=%SolutionDirectory%\out -set ReleaseOutputDirectory=%SolutionDirectory%\out -set DebugLibraryDirectory=%SolutionDirectory%\out -set ReleaseLibraryDirectory=%SolutionDirectory%\out -set TemporaryDirectory=%SolutionDirectory%\temp - -rem Setting environment for using Microsoft Visual Studio x86 tools. -call "%VSCOMMONTOOLS%" - -%PROJECT_TYPE%\embryo.sln - -:END diff --git a/win32/vs8/embryo.sln b/win32/vs8/embryo.sln deleted file mode 100644 index 20f40ac..0000000 --- a/win32/vs8/embryo.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libembryo", "libembryo.vcproj", "{689B4F2B-666D-439F-9BF3-1203D813DE3F}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.ActiveCfg = Debug|Win32 - {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.Build.0 = Debug|Win32 - {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.ActiveCfg = Release|Win32 - {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/win32/vs8/libembryo.vcproj b/win32/vs8/libembryo.vcproj deleted file mode 100644 index 1971cbf..0000000 --- a/win32/vs8/libembryo.vcproj +++ /dev/null @@ -1,243 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/embryo.sln b/win32/vs9/embryo.sln deleted file mode 100644 index 71e42c8..0000000 --- a/win32/vs9/embryo.sln +++ /dev/null @@ -1,29 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libembryo", "libembryo.vcproj", "{689B4F2B-666D-439F-9BF3-1203D813DE3F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "embryo_cc", "embryo_cc.vcproj", "{FBAF823B-A9D5-400F-98E6-AB5EDD444C11}" - ProjectSection(ProjectDependencies) = postProject - {689B4F2B-666D-439F-9BF3-1203D813DE3F} = {689B4F2B-666D-439F-9BF3-1203D813DE3F} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.ActiveCfg = Debug|Win32 - {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.Build.0 = Debug|Win32 - {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.ActiveCfg = Release|Win32 - {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.Build.0 = Release|Win32 - {FBAF823B-A9D5-400F-98E6-AB5EDD444C11}.Debug|Win32.ActiveCfg = Debug|Win32 - {FBAF823B-A9D5-400F-98E6-AB5EDD444C11}.Debug|Win32.Build.0 = Debug|Win32 - {FBAF823B-A9D5-400F-98E6-AB5EDD444C11}.Release|Win32.ActiveCfg = Release|Win32 - {FBAF823B-A9D5-400F-98E6-AB5EDD444C11}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/win32/vs9/embryo_cc.vcproj b/win32/vs9/embryo_cc.vcproj deleted file mode 100644 index 47dd254..0000000 --- a/win32/vs9/embryo_cc.vcproj +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/libembryo.vcproj b/win32/vs9/libembryo.vcproj deleted file mode 100644 index 6318bfa..0000000 --- a/win32/vs9/libembryo.vcproj +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- 2.7.4