On 02/16/2012 07:46 AM, Calvin Morrison wrote:

We have been working solely with the 3.5.13 tarballs. Now that git has settled we also going to work on git builds.

Calvin

There are massive differences between the tarballs and git. There are whole subdirectories either missing or empty compared between the existing tarballs and git for tqtinterface alone. (that is the example I've been working with)

For example, I have prepared sorted file list with identical path information included for comparison in kdiff3. The files are here:

http://www.3111skyline.com/dl/dt/trinity/tmp/git/tde-tqtinterface-tarball.tx... http://www.3111skyline.com/dl/dt/trinity/tmp/git/tde-tqtinterface-git.txt

in the git version, the cmake directory is empty - not good for the build checks:

==> Starting cmake... -- The C compiler identification is GNU -- The CXX compiler identification is GNU -- Check for working C compiler: /usr/bin/gcc -- Check for working C compiler: /usr/bin/gcc -- works -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Check for working CXX compiler: /usr/bin/c++ -- Check for working CXX compiler: /usr/bin/c++ -- works -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done CMake Error at CMakeLists.txt:27 (include): include could not find load file:

TDEMacros

-- Checking for Qt3... -- QT_PREFIX_DIR : /opt/qt3 -- QT_INCLUDE_DIR: /opt/qt3/include -- QT_LIBRARY_DIR: /opt/qt3/lib -- QT_BINARY_DIR : /opt/qt3/bin -- MOC_EXECUTABLE: /opt/qt3/bin/moc (using Qt 3.3.8d) -- UIC_EXECUTABLE: /opt/qt3/bin/uic CMake Error at ConfigureChecks.cmake:158 (tde_save): Unknown CMake command "tde_save". Call Stack (most recent call first): CMakeLists.txt:29 (include)

-- Configuring incomplete, errors occurred! ==> ERROR: A failure occurred in build(). Aborting... ==> ERROR: Build failed, check /mnt/nv1/home/chroot/david/build

Granted, this was an attempt to build tqtinterface from get on a system with qt3 built from the tarball, but I wouldn't expect cmake errors regardless. Anybody got further information on the difference between tarballs and git?

On 02/16/2012 08:19 AM, Serghei Amelian wrote:

Remind me again, why we replaced svn with git? :)

Hehe.... :)

Dunno, it happened while I was away 'stepping on alligators and putting out fires.' :p

Either will work -- I think, but as in my last post -- I suck at git :)

On 02/16/2012 08:32 AM, Robert Xu wrote:

On Thu, Feb 16, 2012 at 09:14, David C. Rankin drankinatty@suddenlinkmail.com wrote:

...

On 02/16/2012 07:46 AM, Calvin Morrison wrote:

...

We have been working solely with the 3.5.13 tarballs. Now that git has settled we also going to work on git builds.

Calvin

There are massive differences between the tarballs and git. There are whole subdirectories either missing or empty compared between the existing tarballs and git for tqtinterface alone. (that is the example I've been working with)

For example, I have prepared sorted file list with identical path information included for comparison in kdiff3. The files are here:

http://www.3111skyline.com/dl/dt/trinity/tmp/git/tde-tqtinterface-tarball.tx... http://www.3111skyline.com/dl/dt/trinity/tmp/git/tde-tqtinterface-git.txt

in the git version, the cmake directory is empty - not good for the build checks:

==> Starting cmake... -- The C compiler identification is GNU -- The CXX compiler identification is GNU -- Check for working C compiler: /usr/bin/gcc -- Check for working C compiler: /usr/bin/gcc -- works -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Check for working CXX compiler: /usr/bin/c++ -- Check for working CXX compiler: /usr/bin/c++ -- works -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done CMake Error at CMakeLists.txt:27 (include): include could not find load file:

TDEMacros

-- Checking for Qt3... -- QT_PREFIX_DIR : /opt/qt3 -- QT_INCLUDE_DIR: /opt/qt3/include -- QT_LIBRARY_DIR: /opt/qt3/lib -- QT_BINARY_DIR : /opt/qt3/bin -- MOC_EXECUTABLE: /opt/qt3/bin/moc (using Qt 3.3.8d) -- UIC_EXECUTABLE: /opt/qt3/bin/uic CMake Error at ConfigureChecks.cmake:158 (tde_save): Unknown CMake command "tde_save". Call Stack (most recent call first): CMakeLists.txt:29 (include)

-- Configuring incomplete, errors occurred! ==> ERROR: A failure occurred in build(). Aborting... ==> ERROR: Build failed, check /mnt/nv1/home/chroot/david/build

Granted, this was an attempt to build tqtinterface from get on a system with qt3 built from the tarball, but I wouldn't expect cmake errors regardless. Anybody got further information on the difference between tarballs and git?

You need to checkout git submodules. (That's what the README about GIT on the wiki is for.)

git submodule update --init

I checked out the entire source tree and according to the wiki page:

To check out the entire source tree

git clone http://<username>@scm.trinitydesktop.org/scm/git/tde cd tde ./scripts/switch_all_submodules_to_head_and_clean

That's exactly what I did. According to the wiki, the 'git submodule update --init' only applies "To check out a single project"

Is this wrong?

On 16 February 2012 09:54, David C. Rankin drankinatty@suddenlinkmail.comwrote:

On 02/16/2012 08:41 AM, David C. Rankin wrote:

...

On 02/16/2012 08:32 AM, Robert Xu wrote:

...

You need to checkout git submodules. (That's what the README about GIT on the wiki is for.)

git submodule update --init

I checked out the entire source tree and according to the wiki page:

To check out the entire source tree

git clone http://<username>@scm.trinitydesktop.org/scm/git/tde cd tde ./scripts/switch_all_submodules_to_head_and_clean

That's exactly what I did. According to the wiki, the 'git submodule

update

...

--init' only applies "To check out a single project"

Is this wrong?

There is definitely something wrong with the git clone or the switch_all_submodules_to_head_and_clean script. I ran the 'git submodule update --init' you suggested and it did nothing for dependencies/tqtinterface/cmake contents. Then, since the output looked the same as it did when I ran the switch_all_submodules_to_head_and_clean script originally, I checked the script and it already did that:

if [[ -e .gitmodules ]]; then if [[ $gituser == "anonymous" ]]; then sed -i 's/system@//g' .gitmodules else sed -i "s/system@/$gituser@/g" .gitmodules fi

   git submodule init
   git submodule update
   git submodule foreach "git checkout master"
   git submodule foreach "git pull"
   git submodule foreach "$THISSCRIPT $gituser"

   git checkout -- .gitmodules

fi

Something doesn't make sense... Is there something wrong with the repository or the script or the wiki? I have run:

git clone http://drankin@scm.trinitydesktop.org/scm/git/tde ./scripts/switch_all_submodules_to_head_and_clean

git pull (subsequently -- and followed each time by another ) ./scripts/switch_all_submodules_to_head_and_clean

Then on your suggestion I ran: git submodule update --init

I still have no TDEMacros or anything else in:

08:50 archangel:/dat_f/tde> l main/dependencies/tqtinterface/cmake/ total 8 drwxr-xr-x 2 david david 4096 Feb 8 18:47 . drwxr-xr-x 5 david david 4096 Feb 8 18:47 ..

According to git, everything is up to date:

08:52 archangel:/dat_f/tde> git pull Already up-to-date.

What gives?

-- David C. Rankin, J.D.,P.E.

git pull --recurse-submodules works for me.