Re: [LyX/master] Add missing boost files to source package

[Peter Kümmel]

Am 16.02.2016 um 20:08 schrieb Georg Baum:

Peter Kümmel wrote:


Am 15.02.2016 um 22:06 schrieb Georg Baum:




Done .


Thanks.


What about the unused files libs/regex/regex.vcproj,
libs/signals/signals.vcproj, libs/regex/src/icu.cpp,
libs/regex/src/usinstances.cpp and libs/regex/src/wc_regex_traits.cpp?
I'd like to remove them from git.


I would not fiddle around with files distributed by boost.
Just use all the files created by bcp/extract.sh.


Then we need to add them to the make rules. Currently they are not built,
and having them in git, but not in the source packages, and not in the build
does not make sense.


When you remove then, don't forget to update .gitignore or the extract script.




Georg

Re: [LyX/master] Add missing boost files to source package

[Georg Baum]

Peter Kümmel wrote:

> Am 15.02.2016 um 22:06 schrieb Georg Baum:
>>
> 
> Done .

Thanks.

>> What about the unused files libs/regex/regex.vcproj,
>> libs/signals/signals.vcproj, libs/regex/src/icu.cpp,
>> libs/regex/src/usinstances.cpp and libs/regex/src/wc_regex_traits.cpp?
>> I'd like to remove them from git.
> 
> I would not fiddle around with files distributed by boost.
> Just use all the files created by bcp/extract.sh.

Then we need to add them to the make rules. Currently they are not built, 
and having them in git, but not in the source packages, and not in the build 
does not make sense.


Georg

Re: [LyX/master] Add missing boost files to source package

[Peter Kümmel]

Am 15.02.2016 um 22:06 schrieb Georg Baum:

Peter Kümmel wrote:


commit 6de524e6cf2d13636b04b9bb850d0a8b1eaa398b
Author: Peter Kümmel 
Date:   Sat Feb 13 18:34:08 2016 +0100

 Add missing boost files to source package

 and remove Visual Studio files, we build with CMake on Windows.

diff --git a/3rdparty/boost/Makefile.am b/3rdparty/boost/Makefile.am
index cfac86b..fcb9ff7 100644
--- a/3rdparty/boost/Makefile.am
+++ b/3rdparty/boost/Makefile.am
@@ -4,13 +4,14 @@ noinst_LIBRARIES = liblyxboost.a

  EXTRA_DIST = boost \
  CMakeLists.txt \
+   LICENSE_1_0.txt \
  libs/CMakeLists.txt \
  libs/regex/CMakeLists.txt \
-   libs/regex/regex.vcproj \
  libs/regex/src/CMakeLists.txt \
  libs/signals/CMakeLists.txt \
-   libs/signals/signals.vcproj \
-   libs/signals/src/CMakeLists.txt
+   libs/signals/src/CMakeLists.txt \
+


boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_common.hpp

\
+


boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_long_long.hpp



Done .


These two additions are not needed, right? At least the files appear in the
tar also before this changes.

What about the unused files libs/regex/regex.vcproj,
libs/signals/signals.vcproj, libs/regex/src/icu.cpp,
libs/regex/src/usinstances.cpp and libs/regex/src/wc_regex_traits.cpp? I'd
like to remove them from git.


I would not fiddle around with files distributed by boost.
Just use all the files created by bcp/extract.sh.

Peter




Georg

Re: [LyX/master] Add missing boost files to source package

[Peter Kümmel]

Am 15.02.2016 um 22:06 schrieb Georg Baum:

Peter Kümmel wrote:


commit 6de524e6cf2d13636b04b9bb850d0a8b1eaa398b
Author: Peter Kümmel 
Date:   Sat Feb 13 18:34:08 2016 +0100

 Add missing boost files to source package

 and remove Visual Studio files, we build with CMake on Windows.

diff --git a/3rdparty/boost/Makefile.am b/3rdparty/boost/Makefile.am
index cfac86b..fcb9ff7 100644
--- a/3rdparty/boost/Makefile.am
+++ b/3rdparty/boost/Makefile.am
@@ -4,13 +4,14 @@ noinst_LIBRARIES = liblyxboost.a

  EXTRA_DIST = boost \
  CMakeLists.txt \
+   LICENSE_1_0.txt \
  libs/CMakeLists.txt \
  libs/regex/CMakeLists.txt \
-   libs/regex/regex.vcproj \
  libs/regex/src/CMakeLists.txt \
  libs/signals/CMakeLists.txt \
-   libs/signals/signals.vcproj \
-   libs/signals/src/CMakeLists.txt
+   libs/signals/src/CMakeLists.txt \
+


boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_common.hpp

\
+


boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_long_long.hpp

These two additions are not needed, right? At least the files appear in the
tar also before this changes.


Yes, only the .txt files are needed.



What about the unused files libs/regex/regex.vcproj,
libs/signals/signals.vcproj, libs/regex/src/icu.cpp,
libs/regex/src/usinstances.cpp and libs/regex/src/wc_regex_traits.cpp? I'd
like to remove them from git.



I'm sure only about .vcproj.



Georg

Re: [LyX/master] Add missing boost files to source package

[Georg Baum]

Peter Kümmel wrote:

> commit 6de524e6cf2d13636b04b9bb850d0a8b1eaa398b
> Author: Peter Kümmel 
> Date:   Sat Feb 13 18:34:08 2016 +0100
> 
> Add missing boost files to source package
> 
> and remove Visual Studio files, we build with CMake on Windows.
> 
> diff --git a/3rdparty/boost/Makefile.am b/3rdparty/boost/Makefile.am
> index cfac86b..fcb9ff7 100644
> --- a/3rdparty/boost/Makefile.am
> +++ b/3rdparty/boost/Makefile.am
> @@ -4,13 +4,14 @@ noinst_LIBRARIES = liblyxboost.a
>  
>  EXTRA_DIST = boost \
>  CMakeLists.txt \
> + LICENSE_1_0.txt \
>  libs/CMakeLists.txt \
>  libs/regex/CMakeLists.txt \
> - libs/regex/regex.vcproj \
>  libs/regex/src/CMakeLists.txt \
>  libs/signals/CMakeLists.txt \
> - libs/signals/signals.vcproj \
> - libs/signals/src/CMakeLists.txt
> + libs/signals/src/CMakeLists.txt \
> +
> 
boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_common.hpp
> \
> +
> 
boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_long_long.hpp

These two additions are not needed, right? At least the files appear in the 
tar also before this changes.

What about the unused files libs/regex/regex.vcproj, 
libs/signals/signals.vcproj, libs/regex/src/icu.cpp, 
libs/regex/src/usinstances.cpp and libs/regex/src/wc_regex_traits.cpp? I'd 
like to remove them from git.


Georg