X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=toolbox;h=a9425fab3a766478273dae56260b6fd92317cf5a;hb=56aa04bd7e0d414afd2c076d64ba3d407fa0c686;hp=3942dd7bbda75263321d9174f9647a66d073ca5d;hpb=1f9e100842c6fb0277adb638d6c8fe7f459ef7c8;p=vlc

diff --git a/toolbox b/toolbox
index 3942dd7bbd..a9425fab3a 100755
--- a/toolbox
+++ b/toolbox
@@ -115,7 +115,7 @@ if test "${action}" = "changelog"
 then
   YEAR="`date +%Y`"
   echo "toolbox --changelog no longer required. use this instead:"
-  echo " svn log -v -r '{$YEAR-01-01}:{$YEAR-12-31}' > ChangeLog"
+  echo " svn log -v -r '{$YEAR-12-31}:{$YEAR-01-01}' > ChangeLog"
   exit 0
 fi
 
@@ -218,6 +218,18 @@ SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M}
 !ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE x86em) Debug"${M}
 # PROP Output_Dir "X86EMDbg\\${subdir}"${M}
 # PROP Intermediate_Dir "X86EMDbg\\${subdir}"${M}
+!ELSEIF  "\$(CFG)" == "libvlc - Win32 (WCE emulator) Debug"${M}
+# PROP Output_Dir "emulatorDbg\\${subdir}"${M}
+# PROP Intermediate_Dir "emulatorDbg\\${subdir}"${M}
+!ELSEIF  "\$(CFG)" == "libvlc - Win32 (WCE emulator) Release"${M}
+# PROP Output_Dir "emulatorRel\\${subdir}"${M}
+# PROP Intermediate_Dir "emulatorRel\\${subdir}"${M}
+!ELSEIF  "\$(CFG)" == "libvlc - Win32 (WCE x86) Debug"${M}
+# PROP Output_Dir "X86Dbg\\${subdir}"${M}
+# PROP Intermediate_Dir "X86Dbg\\${subdir}"${M}
+!ELSEIF  "\$(CFG)" == "libvlc - Win32 (WCE x86) Release"${M}
+# PROP Output_Dir "X86Rel\\${subdir}"${M}
+# PROP Intermediate_Dir "X86Rel\\${subdir}"${M}
 !ENDIF${M}
 # End Source File${M}
 EOF
@@ -326,20 +338,11 @@ EOF
     #  Top of the project file
     perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
     #  The source files
-    if test "${target}" = "evc/vlc.vcp"
-    then
-      cat >> ${target} << EOF
-# Begin Source File${M}
-SOURCE="..\\evc\\vlc.c"${M}
-# End Source File${M}
-EOF
-    else
       cat >> ${target} << EOF
 # Begin Source File${M}
 SOURCE="..\\src\\vlc.c"${M}
 # End Source File${M}
 EOF
-    fi
     #  Bottom of the project file - handles resource files too
     perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
   done
@@ -353,14 +356,6 @@ fi
 ##
 if test "${action}" = "po"
 then
-  # create a fake file containing win32 strings
-  rm -f modules/gui/win32/strings.cpp
-  #printf "/* Automatically generated by 'toolbox --update-po', please don't compile */\n" > modules/gui/win32/strings.cpp
-  #find modules/gui/win32 -name '*.dfm' | while read file
-  #do
-  #  printf "\n/*\n * from $file:\n */\n\n" >> modules/gui/win32/strings.cpp
-  #  perl -ne 'chop; chop; if( / (Caption|Text|Hint) / || $buffer =~ /[+=] *$/ ) { $buffer =~ s/\+ *$//; $buffer .= $_; } if( $buffer =~ /'"'"' *$/) { $buffer =~ s/'"'"'/"/g; $buffer =~ s/\\/\\\\/g; $buffer =~ s/=/= _(/; print $buffer." );\n"; $buffer = "";}' < $file | grep -v '"-*"' | grep -v '"http://' | grep -v '"vlcs"' >> modules/gui/win32/strings.cpp || exit 1
-  #done
   # find out the source files
   rm -f po/POTFILES.in
   echo "# automatically created by toolbox --update-po" > po/POTFILES.in
@@ -372,7 +367,7 @@ then
   echo "" >> po/POTFILES.in
   echo "# modules" >> po/POTFILES.in
   find modules -name '*.[chm]' -o -name '*.[ch]pp' \
-    | grep -v '\(gui/wxwindows/wizard\|\.moc\.\|gui/gtk2/\)' \
+    | grep -v '\(\.moc\.\|gui/gtk2/\)' \
     | sort >> po/POTFILES.in
   # clean old potfiles
   cd po
@@ -554,20 +549,6 @@ EOF
   exit 0
 fi
 
-##
-##  Fix flexml-generated files
-##
-if test "${action}" = "flexml"
-then
-  cd modules/gui/skins/parser
-  flexml -SH -a skin.act skin.dtd
-  # comment the dummy main function
-  file=skin.c
-  sed 's@int main@//int main@' < $file > $file.$$.bak
-  mv -f $file.$$.bak $file
-  flex -oflex.c -BLs skin.l
-fi
-
 ##
 ##  Make distclean
 ##